summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@linux.vnet.ibm.com>2007-09-15 04:54:12 +1000
committerJosh Boyer <jwboyer@gmail.com>2007-09-19 21:13:16 -0500
commit8d9ae994d8fce807fc90fb8e3b6ac8df1cc7dce6 (patch)
treef2b46b7d8830e9802e80b5134e48e75eadecb455
parent658e81701970a82d33f46241f20be416ebd5e930 (diff)
downloadop-kernel-dev-8d9ae994d8fce807fc90fb8e3b6ac8df1cc7dce6.zip
op-kernel-dev-8d9ae994d8fce807fc90fb8e3b6ac8df1cc7dce6.tar.gz
[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>
-rw-r--r--drivers/mtd/maps/physmap_of.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/mtd/maps/physmap_of.c b/drivers/mtd/maps/physmap_of.c
index 3df001b..096dd47 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)
OpenPOWER on IntegriCloud