Skip to contentSkip to conversation

Check name property to determine partition nodes.

PATCH Applied Benjamin Krill 3 participants 5 messages Jan 23, 2009 – Mar 24, 2009 Memory technology devices (MTD)

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 Check name property to determine partition nodes.

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.

---
 drivers/mtd/ofpart.c |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)
drivers/mtd/ofpart.c +7 -0
index 9e45b3f..3e164f0 100644
@@ -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);
Signature · 1 line
1.6.0.6
#1 lore raw
Quoted 7 lines · Benjamin Krill

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 23 lines
---
 drivers/mtd/ofpart.c |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)
drivers/mtd/ofpart.c +7 -0
index 9e45b3f..3e164f0 100644
@@ -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);
#2 lore raw
Quoted 11 lines · * Benjamin Herrenschmidt | 2009-02-04 15:09:02 [+1100]:
Quoted 7 lines · Benjamin Krill

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

#3 lore raw
Quoted 9 lines
Quoted 9 lines · Benjamin Krill
Quoted 7 lines

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.

Quoted 4 lines
Quoted 2 lines

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

#4 lore raw
Quoted 9 lines · Benjamin Krill
Quoted 9 lines
Quoted 9 lines · Benjamin Krill
Quoted 7 lines

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.

Quoted 6 lines
Quoted 4 lines
Quoted 2 lines

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.

Signature · 1 line
dwmw2