From 644a4de1b0cbddf6b8ecf3b83793f1429652f817 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= <u.kleine-koenig@pengutronix.de>
Date: Mon, 13 Feb 2012 16:12:24 +0100
Subject: [PATCH] --- yaml --- r: 298127 b: refs/heads/master c:
 3410a711a52bdb5eac1395fc6734a3ef801f903b h: refs/heads/master i:   298125:
 c7de27696dd62cbe1ca0a389d5a5140585415698   298123:
 a6a64f0e685c1bdea93c8c8a3b5ce95a2eb37ab0   298119:
 afdaf653148b99fde80fe79057ade353c89f09a3   298111:
 5910f13e477b909af60de3f2f95c0b9d00ec97a0 v: v3

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

diff --git a/[refs] b/[refs]
index cd9de925b52e..d7c267ddf4a4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 88dfda5f7463ce73f14f4eaf275284047f367570
+refs/heads/master: 3410a711a52bdb5eac1395fc6734a3ef801f903b
diff --git a/trunk/drivers/mtd/chips/chipreg.c b/trunk/drivers/mtd/chips/chipreg.c
index da1f96f385c7..0bbc61ba9524 100644
--- a/trunk/drivers/mtd/chips/chipreg.c
+++ b/trunk/drivers/mtd/chips/chipreg.c
@@ -76,10 +76,7 @@ struct mtd_info *do_map_probe(const char *name, struct map_info *map)
 	*/
 	module_put(drv->module);
 
-	if (ret)
-		return ret;
-
-	return NULL;
+	return ret;
 }
 /*
  * Destroy an MTD device which was created for a map device.