diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-06 14:23:39 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-06 14:23:39 +0200 |
| commit | 68083e05d72d94f347293d8cc0067050ba904bfa (patch) | |
| tree | 842e71365bd90866be7add181661a4039d891564 /drivers/mtd/onenand/generic.c | |
| parent | cpumask: make for_each_cpu_mask a bit smaller (diff) | |
| parent | Linux 2.6.26-rc9 (diff) | |
| download | linux-68083e05d72d94f347293d8cc0067050ba904bfa.tar.xz linux-68083e05d72d94f347293d8cc0067050ba904bfa.zip | |
Merge commit 'v2.6.26-rc9' into cpus4096
Diffstat (limited to 'drivers/mtd/onenand/generic.c')
| -rw-r--r-- | drivers/mtd/onenand/generic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mtd/onenand/generic.c b/drivers/mtd/onenand/generic.c index 3d44d040a47d..ad81ab8e95e2 100644 --- a/drivers/mtd/onenand/generic.c +++ b/drivers/mtd/onenand/generic.c @@ -76,7 +76,7 @@ static int __devinit generic_onenand_probe(struct device *dev) err = parse_mtd_partitions(&info->mtd, part_probes, &info->parts, 0); if (err > 0) add_mtd_partitions(&info->mtd, info->parts, err); - else if (err < 0 && pdata->parts) + else if (err <= 0 && pdata->parts) add_mtd_partitions(&info->mtd, pdata->parts, pdata->nr_parts); else #endif |