git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vxge: Fixes in isr routine
[safe/jmp/linux-2.6]
/
drivers
/
mtd
/
ofpart.c
diff --git
a/drivers/mtd/ofpart.c
b/drivers/mtd/ofpart.c
index
4f80c2f
..
3e164f0
100644
(file)
--- a/
drivers/mtd/ofpart.c
+++ b/
drivers/mtd/ofpart.c
@@
-20,7
+20,6
@@
#include <linux/mtd/partitions.h>
int __devinit of_mtd_parse_partitions(struct device *dev,
#include <linux/mtd/partitions.h>
int __devinit of_mtd_parse_partitions(struct device *dev,
- struct mtd_info *mtd,
struct device_node *node,
struct mtd_partition **pparts)
{
struct device_node *node,
struct mtd_partition **pparts)
{
@@
-47,6
+46,13
@@
int __devinit of_mtd_parse_partitions(struct device *dev,
const u32 *reg;
int len;
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);
reg = of_get_property(pp, "reg", &len);
if (!reg || (len != 2 * sizeof(u32))) {
of_node_put(pp);