From 8a53ddd30dcb5bcb067f178a8358b725895ad51a Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Mon, 5 Sep 2011 10:56:57 -0700
Subject: [PATCH] --- yaml --- r: 266977 b: refs/heads/master c:
 a7ace561f1e3ebbf40ff20adde9968721a55ef0a h: refs/heads/master i:   266975:
 6f49f53b859c618056178717607cdbddcae2ef59 v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/base/regmap/regmap.c | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 13b76cf46c62..5bac99411c7b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fec4fe26ec69cc63f56e649759b3c8bcc98016ea
+refs/heads/master: a7ace561f1e3ebbf40ff20adde9968721a55ef0a
diff --git a/trunk/drivers/base/regmap/regmap.c b/trunk/drivers/base/regmap/regmap.c
index fa2bd896eb20..86b184776199 100644
--- a/trunk/drivers/base/regmap/regmap.c
+++ b/trunk/drivers/base/regmap/regmap.c
@@ -198,15 +198,13 @@ struct regmap *regmap_init(struct device *dev,
 	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:
@@ -221,7 +219,6 @@ 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);