[PATCH v2] Check name property to determine partition nodes.

Subsystems: memory technology devices (mtd), the rest

STALE6378d

5 messages, 3 authors, 2009-03-24 · open the first message on its own page

[PATCH v2] Check name property to determine partition nodes.

From: Benjamin Krill <hidden>
Date: 2009-01-23 16:18:01

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 <redacted>
---
 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);
-- 
1.6.0.6

Re: [PATCH v2] Check name property to determine partition nodes.

From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: 2009-02-04 04:17:54

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.
quoted hunk
Signed-off-by: Benjamin Krill <redacted>
---
 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);

Re: [PATCH v2] Check name property to determine partition nodes.

From: Benjamin Krill <hidden>
Date: 2009-02-18 07:46:08

* Benjamin Herrenschmidt | 2009-02-04 15:09:02 [+1100]:
On Fri, 2009-01-23 at 17:18 +0100, Benjamin Krill wrote:
quoted
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

Re: [PATCH v2] Check name property to determine partition nodes.

From: Benjamin Krill <hidden>
Date: 2009-03-24 13:27:43

quoted
On Fri, 2009-01-23 at 17:18 +0100, Benjamin Krill wrote:
quoted
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

Re: [PATCH v2] Check name property to determine partition nodes.

From: David Woodhouse <dwmw2@infradead.org>
Date: 2009-03-24 14:05:04

On Tue, 2009-03-24 at 14:27 +0100, Benjamin Krill wrote:
quoted
quoted
On Fri, 2009-01-23 at 17:18 +0100, Benjamin Krill wrote:
quoted
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.

-- 
dwmw2
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help