From 4682a7c6ebe4fba5e8ada82103fc34cfd2681fc9 Mon Sep 17 00:00:00 2001
From: Lars-Peter Clausen <lars@metafoo.de>
Date: Mon, 14 Nov 2011 10:40:15 +0100
Subject: [PATCH] --- yaml --- r: 280538 b: refs/heads/master c:
 abbb18fb4ad7472ee2e1351f0ca12bce64cac143 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 0e0eaa1f03a7..f5a85d1417ef 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 58072cbfc522c2520e34333a53c8f17bb1adb1a0
+refs/heads/master: abbb18fb4ad7472ee2e1351f0ca12bce64cac143
diff --git a/trunk/drivers/base/regmap/regmap.c b/trunk/drivers/base/regmap/regmap.c
index b08df85cedff..b84ebf9eecf0 100644
--- a/trunk/drivers/base/regmap/regmap.c
+++ b/trunk/drivers/base/regmap/regmap.c
@@ -139,7 +139,7 @@ struct regmap *regmap_init(struct device *dev,
 	int ret = -EINVAL;
 
 	if (!bus || !config)
-		return NULL;
+		goto err;
 
 	map = kzalloc(sizeof(*map), GFP_KERNEL);
 	if (map == NULL) {