Merge branch 'regmap-linus' into regmap-next

diff --cc drivers/base/regmap/regmap.c
index fa2bd896eb208fa8a92732eb6a2accf3ee3a4732,20663f8dae45a3674e6ce04c84a54c5e07361151..86b1847761998bd45ee5ce39994d87803daf7b09
--- 1/drivers/base/regmap/regmap.c
--- 2/drivers/base/regmap/regmap.c
+++ b/drivers/base/regmap/regmap.c
@@@ -198,15 -168,11 +198,13 @@@ struct regmap *regmap_init(struct devic
        map->work_buf = kmalloc(map->format.buf_size, GFP_KERNEL);
        if (map->work_buf == NULL) {
                ret = -ENOMEM;
-               goto err_bus;
+               goto err_map;
        }
  
 +      regmap_debugfs_init(map);
 +
        return map;
  
- err_bus:
-       module_put(map->bus->owner);
  err_map:
        kfree(map);
  err:
@@@ -219,9 -185,7 +217,8 @@@ EXPORT_SYMBOL_GPL(regmap_init)
   */
  void regmap_exit(struct regmap *map)
  {
 +      regmap_debugfs_exit(map);
        kfree(map->work_buf);
-       module_put(map->bus->owner);
        kfree(map);
  }
  EXPORT_SYMBOL_GPL(regmap_exit);