From 66f35e2b2bf4c773c51fb813ddf4be49ed2b963e 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: 291759 b: refs/heads/master c:
 0a413d708a5df80f50b2fb8c24a32c559a06bffc h: refs/heads/master i:   291757:
 6163ceb6e9d716ffda44f37070e8de324bcd17e1   291755:
 12dd13f1d246137d6b02b4ae28a81dc9ab533773   291751:
 5ba807051ba17bae59d8ee60a2b4ad5e93b76a61   291743:
 46f96cd1b20ddc038f5e2491b0c8183c3f6eeea4 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 0dced07a37a7..d286f6a38e56 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 73c1e20430cbb96947fe3b835c6a3c13805eafd8
+refs/heads/master: 0a413d708a5df80f50b2fb8c24a32c559a06bffc
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.