From: Mark Brown <broonie@kernel.org>
Date: Mon, 5 Oct 2020 17:53:24 +0000 (+0100)
Subject: Merge remote-tracking branch 'regmap/for-5.10' into regmap-next
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=6e0545c4f08368e67496111778a726f9a2031f26;p=linux.git

Merge remote-tracking branch 'regmap/for-5.10' into regmap-next
---

6e0545c4f08368e67496111778a726f9a2031f26
diff --cc drivers/base/regmap/regmap.c
index b71f9ecddff5d,b65e8338243f3..5db536ccfcd6b
--- a/drivers/base/regmap/regmap.c
+++ b/drivers/base/regmap/regmap.c
@@@ -707,12 -699,19 +719,15 @@@ struct regmap *__regmap_init(struct dev
  		goto err;
  	}
  
 -	if (config->name) {
 -		map->name = kstrdup_const(config->name, GFP_KERNEL);
 -		if (!map->name) {
 -			ret = -ENOMEM;
 -			goto err_map;
 -		}
 -	}
 +	ret = regmap_set_name(map, config);
 +	if (ret)
 +		goto err_map;
  
+ 	ret = -EINVAL; /* Later error paths rely on this */
+ 
  	if (config->disable_locking) {
  		map->lock = map->unlock = regmap_lock_unlock_none;
+ 		map->can_sleep = config->can_sleep;
  		regmap_debugfs_disable(map);
  	} else if (config->lock && config->unlock) {
  		map->lock = config->lock;