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

diff --cc drivers/base/regmap/internal.h
Simple merge

diff --cc drivers/base/regmap/regmap-debugfs.c
Simple merge

diff --cc drivers/base/regmap/regmap.c
index b71f9ec,b65e833..5db536c
--- 1/drivers/base/regmap/regmap.c
--- 2/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;