From: Josh Boyer <jwboyer@linux.vnet.ibm.com>
Date: Fri, 14 Sep 2007 18:54:12 +0000 (+1000)
Subject: [POWERPC] Make partitions optional in physmap_of
X-Git-Tag: v2.6.24-rc1~1450^2~200
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8d9ae994d8fce807fc90fb8e3b6ac8df1cc7dce6;p=linux-2.6

[POWERPC] Make partitions optional in physmap_of

The latest physmap_of driver has a small error where it will fail the probe
with:

physmap-flash: probe of fff00000.small-flas failed with error -2

if there are no partition subnodes in the device tree and the old style binding
is not used.  Since partition definitions are optional, the probe should still
succeed.

Signed-off-by: Josh Boyer <jwboyer@linux.vnet.ibm.com>
Acked-by: David Gibson <david@gibson.dropbear.id.au>
---

diff --git a/drivers/mtd/maps/physmap_of.c b/drivers/mtd/maps/physmap_of.c
index 3df001bfee..096dd47b5d 100644
--- a/drivers/mtd/maps/physmap_of.c
+++ b/drivers/mtd/maps/physmap_of.c
@@ -142,6 +142,8 @@ static int __devinit process_partitions(struct physmap_flash_info *info,
 		}
 	} else {
 		nr_parts = parse_obsolete_partitions(dev, info, dp);
+		if (nr_parts == -ENOENT)
+			nr_parts = 0;
 	}
 
 	if (nr_parts < 0)