| Message ID | 20090123161805.GA2598@codiert.org |
|---|---|
| State | Accepted |
| Commit | 4b08e149c0e02e97ec49c2a31d14a0d3a02f8074 |
| Headers | show |
On Fri, 2009-01-23 at 17:18 +0100, Benjamin Krill wrote: > SLOF has a further node which could not be evaluate > by the current routine. The current routine returns > because the node hasn't the required reg property. As > fix this patch adds a check to determine the partition > child nodes. If the node is not an partition the number > of total partitions will be decreased and loop continue > with the next nodes. Somebody on the MTD list is taking that ? David ? Or should I merge it via powerpc ? Cheers, Ben. > Signed-off-by: Benjamin Krill <ben@codiert.org> > --- > drivers/mtd/ofpart.c | 7 +++++++ > 1 files changed, 7 insertions(+), 0 deletions(-) > > diff --git a/drivers/mtd/ofpart.c b/drivers/mtd/ofpart.c > index 9e45b3f..3e164f0 100644 > --- a/drivers/mtd/ofpart.c > +++ b/drivers/mtd/ofpart.c > @@ -46,6 +46,13 @@ int __devinit of_mtd_parse_partitions(struct device *dev, > const u32 *reg; > int len; > > + /* check if this is a partition node */ > + partname = of_get_property(pp, "name", &len); > + if (strcmp(partname, "partition") != 0) { > + nr_parts--; > + continue; > + } > + > reg = of_get_property(pp, "reg", &len); > if (!reg || (len != 2 * sizeof(u32))) { > of_node_put(pp);
* Benjamin Herrenschmidt | 2009-02-04 15:09:02 [+1100]: >On Fri, 2009-01-23 at 17:18 +0100, Benjamin Krill wrote: >> SLOF has a further node which could not be evaluate >> by the current routine. The current routine returns >> because the node hasn't the required reg property. As >> fix this patch adds a check to determine the partition >> child nodes. If the node is not an partition the number >> of total partitions will be decreased and loop continue >> with the next nodes. > >Somebody on the MTD list is taking that ? David ? Or should I merge it >via powerpc ? Could somebody merge it for the next release? Ben
>>On Fri, 2009-01-23 at 17:18 +0100, Benjamin Krill wrote: >>> SLOF has a further node which could not be evaluate >>> by the current routine. The current routine returns >>> because the node hasn't the required reg property. As >>> fix this patch adds a check to determine the partition >>> child nodes. If the node is not an partition the number >>> of total partitions will be decreased and loop continue >>> with the next nodes. >> >>Somebody on the MTD list is taking that ? David ? Or should I merge it >>via powerpc ? > >Could somebody merge it for the next release? Again, new try to get it somewhere merged. cheers ben
On Tue, 2009-03-24 at 14:27 +0100, Benjamin Krill wrote: > >>On Fri, 2009-01-23 at 17:18 +0100, Benjamin Krill wrote: > >>> SLOF has a further node which could not be evaluate > >>> by the current routine. The current routine returns > >>> because the node hasn't the required reg property. As > >>> fix this patch adds a check to determine the partition > >>> child nodes. If the node is not an partition the number > >>> of total partitions will be decreased and loop continue > >>> with the next nodes. > >> > >>Somebody on the MTD list is taking that ? David ? Or should I merge it > >>via powerpc ? > > > >Could somebody merge it for the next release? > > Again, new try to get it somewhere merged. Applied; thanks.
diff --git a/drivers/mtd/ofpart.c b/drivers/mtd/ofpart.c index 9e45b3f..3e164f0 100644 --- a/drivers/mtd/ofpart.c +++ b/drivers/mtd/ofpart.c @@ -46,6 +46,13 @@ int __devinit of_mtd_parse_partitions(struct device *dev, const u32 *reg; int len; + /* check if this is a partition node */ + partname = of_get_property(pp, "name", &len); + if (strcmp(partname, "partition") != 0) { + nr_parts--; + continue; + } + reg = of_get_property(pp, "reg", &len); if (!reg || (len != 2 * sizeof(u32))) { of_node_put(pp);
SLOF has a further node which could not be evaluate by the current routine. The current routine returns because the node hasn't the required reg property. As fix this patch adds a check to determine the partition child nodes. If the node is not an partition the number of total partitions will be decreased and loop continue with the next nodes. Signed-off-by: Benjamin Krill <ben@codiert.org> --- drivers/mtd/ofpart.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-)