From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Mon, 5 Sep 2011 17:56:57 +0000 (-0700)
Subject: Merge branch 'regmap-linus' into regmap-next
X-Git-Tag: v3.2-rc1~181^2~40
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a7ace561f1e3ebbf40ff20adde9968721a55ef0a;p=profile%2Fivi%2Fkernel-x86-ivi.git

Merge branch 'regmap-linus' into regmap-next
---

a7ace561f1e3ebbf40ff20adde9968721a55ef0a
diff --cc drivers/base/regmap/regmap.c
index fa2bd89,20663f8..86b1847
--- a/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);