From 765bd492a52575fede3c2334debac2a4cc702d34 Mon Sep 17 00:00:00 2001
From: Lars-Peter Clausen <lars@metafoo.de>
Date: Thu, 10 Nov 2011 18:15:15 +0100
Subject: [PATCH] --- yaml --- r: 280537 b: refs/heads/master c:
 58072cbfc522c2520e34333a53c8f17bb1adb1a0 h: refs/heads/master i:   280535:
 fe23510f1fd0e6f020efc140516277b534b371fa v: v3

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

diff --git a/[refs] b/[refs]
index c5072f6c4b6f..0e0eaa1f03a7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c48a9d74926c83f62b0251eff0a3dde259923856
+refs/heads/master: 58072cbfc522c2520e34333a53c8f17bb1adb1a0
diff --git a/trunk/drivers/base/regmap/regmap.c b/trunk/drivers/base/regmap/regmap.c
index 3e30d168eb1d..b08df85cedff 100644
--- a/trunk/drivers/base/regmap/regmap.c
+++ b/trunk/drivers/base/regmap/regmap.c
@@ -229,12 +229,14 @@ struct regmap *regmap_init(struct device *dev,
 
 	ret = regcache_init(map);
 	if (ret < 0)
-		goto err_map;
+		goto err_free_workbuf;
 
 	regmap_debugfs_init(map);
 
 	return map;
 
+err_free_workbuf:
+	kfree(map->work_buf);
 err_map:
 	kfree(map);
 err: