From 4fdef767a22ed6648795a9c2ccce5e8b7f975325 Mon Sep 17 00:00:00 2001
From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Mon, 28 Nov 2011 16:53:13 +0300
Subject: [PATCH] --- yaml --- r: 282830 b: refs/heads/master c:
 b49e345e61a2e0c4decbe9b1bd670ed5599fac6e h: refs/heads/master v: v3

---
 [refs]                            |  2 +-
 trunk/drivers/mtd/devices/docg3.c | 21 ++++++++++++---------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index 84c167d809fc..a11621fece31 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5d3667eee40a88f79f7f826f0b4c3c9647d7ea7a
+refs/heads/master: b49e345e61a2e0c4decbe9b1bd670ed5599fac6e
diff --git a/trunk/drivers/mtd/devices/docg3.c b/trunk/drivers/mtd/devices/docg3.c
index d7df3114aa17..f7490a014e78 100644
--- a/trunk/drivers/mtd/devices/docg3.c
+++ b/trunk/drivers/mtd/devices/docg3.c
@@ -2027,21 +2027,24 @@ static int __init docg3_probe(struct platform_device *pdev)
 	if (!docg3_bch)
 		goto nomem2;
 
-	ret = 0;
 	for (floor = 0; floor < DOC_MAX_NBFLOORS; floor++) {
 		mtd = doc_probe_device(base, floor, dev);
-		if (floor == 0 && !mtd)
-			goto notfound;
-		if (!IS_ERR_OR_NULL(mtd))
-			ret = mtd_device_parse_register(mtd, part_probes,
-							NULL, NULL, 0);
-		else
+		if (IS_ERR(mtd)) {
 			ret = PTR_ERR(mtd);
+			goto err_probe;
+		}
+		if (!mtd) {
+			if (floor == 0)
+				goto notfound;
+			else
+				continue;
+		}
 		docg3_floors[floor] = mtd;
+		ret = mtd_device_parse_register(mtd, part_probes, NULL, NULL,
+						0);
 		if (ret)
 			goto err_probe;
-		if (mtd)
-			found++;
+		found++;
 	}
 
 	ret = doc_register_sysfs(pdev, docg3_floors);