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.