diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-05 17:25:48 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-05 17:25:48 -0400 |
| commit | 698f7a4a12c15fef354b2a1ac14f90a0e71008d9 (patch) | |
| tree | e8332a80e1ca588a374647111c20b4aa2ee36aac /drivers/mtd/onenand/generic.c | |
| parent | adbd5886da5f467148b26cca3728ab0e672b3fcc (diff) | |
| parent | ba75321193900a236bc5bbc29145e1039f74eb1b (diff) | |
Merge git://git.infradead.org/~dwmw2/mtd-2.6.26
* git://git.infradead.org/~dwmw2/mtd-2.6.26:
[MTD] [MAPS] Fix cmdlineparse handling in mapping files
[MTD] [NAND] pxa: fix incorrect calling of pxa3xx_nand_config() on resume path
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) | |||
| 76 | err = parse_mtd_partitions(&info->mtd, part_probes, &info->parts, 0); | 76 | err = parse_mtd_partitions(&info->mtd, part_probes, &info->parts, 0); |
| 77 | if (err > 0) | 77 | if (err > 0) |
| 78 | add_mtd_partitions(&info->mtd, info->parts, err); | 78 | add_mtd_partitions(&info->mtd, info->parts, err); |
| 79 | else if (err < 0 && pdata->parts) | 79 | else if (err <= 0 && pdata->parts) |
| 80 | add_mtd_partitions(&info->mtd, pdata->parts, pdata->nr_parts); | 80 | add_mtd_partitions(&info->mtd, pdata->parts, pdata->nr_parts); |
| 81 | else | 81 | else |
| 82 | #endif | 82 | #endif |