From 99e8116ef41c06d744ac0c55c869e3f90e38b060 Mon Sep 17 00:00:00 2001
From: Anton Prins <anton.prins@nl.bosch.com>
Date: Tue, 27 Nov 2012 16:38:16 +0100
Subject: [PATCH] --- yaml --- r: 347219 b: refs/heads/master c:
 e58a66d84bceba314b03e37ec0764b9b1b9227d0 h: refs/heads/master i:   347217:
 126e6b8df2f544172b06031eaddc39f26e7b712b   347215:
 d1c6daf6d27502865f1628b714620a0b7b689a71 v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/mtd/maps/physmap_of.c | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 84fbe85494ed..c4a7dcc5031c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6c810f90140a3274181c4093d5dd4c88c6fff0b4
+refs/heads/master: e58a66d84bceba314b03e37ec0764b9b1b9227d0
diff --git a/trunk/drivers/mtd/maps/physmap_of.c b/trunk/drivers/mtd/maps/physmap_of.c
index cde8bf94338e..37cdc201652f 100644
--- a/trunk/drivers/mtd/maps/physmap_of.c
+++ b/trunk/drivers/mtd/maps/physmap_of.c
@@ -285,6 +285,7 @@ static int of_flash_probe(struct platform_device *dev)
 	}
 
 	err = 0;
+	info->cmtd = NULL;
 	if (info->list_size == 1) {
 		info->cmtd = info->list[0].mtd;
 	} else if (info->list_size > 1) {
@@ -293,9 +294,10 @@ static int of_flash_probe(struct platform_device *dev)
 		 */
 		info->cmtd = mtd_concat_create(mtd_list, info->list_size,
 					       dev_name(&dev->dev));
-		if (info->cmtd == NULL)
-			err = -ENXIO;
 	}
+	if (info->cmtd == NULL)
+		err = -ENXIO;
+
 	if (err)
 		goto err_out;