diff options
| author | Michael Büsch <mb@bu3sch.de> | 2010-08-21 19:25:07 +0000 |
|---|---|---|
| committer | Michael Büsch <mb@bu3sch.de> | 2010-08-21 19:25:07 +0000 |
| commit | 6f9b7988d5640054b547bc3d34bdb1837f8bb28e (patch) | |
| tree | a1a4d45018a1c5ca7cb49c43988bf9da4404926a /target/linux/generic/patches-2.6.35/080-mtd_plat_nand_chip_fixup.patch | |
| parent | 9d6ca187394784888a3b5bd7857defded4d20a44 (diff) | |
| download | master-187ad058-6f9b7988d5640054b547bc3d34bdb1837f8bb28e.tar.gz master-187ad058-6f9b7988d5640054b547bc3d34bdb1837f8bb28e.tar.bz2 master-187ad058-6f9b7988d5640054b547bc3d34bdb1837f8bb28e.zip | |
Update to 2.6.35.3
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22753 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-2.6.35/080-mtd_plat_nand_chip_fixup.patch')
| -rw-r--r-- | target/linux/generic/patches-2.6.35/080-mtd_plat_nand_chip_fixup.patch | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/target/linux/generic/patches-2.6.35/080-mtd_plat_nand_chip_fixup.patch b/target/linux/generic/patches-2.6.35/080-mtd_plat_nand_chip_fixup.patch index e04b754d8c..837e3a512b 100644 --- a/target/linux/generic/patches-2.6.35/080-mtd_plat_nand_chip_fixup.patch +++ b/target/linux/generic/patches-2.6.35/080-mtd_plat_nand_chip_fixup.patch @@ -1,5 +1,10 @@ ---- a/include/linux/mtd/nand.h -+++ b/include/linux/mtd/nand.h +--- + drivers/mtd/nand/plat_nand.c | 13 ++++++++++++- + include/linux/mtd/nand.h | 1 + + 2 files changed, 13 insertions(+), 1 deletion(-) + +--- linux-2.6.35.3.orig/include/linux/mtd/nand.h ++++ linux-2.6.35.3/include/linux/mtd/nand.h @@ -512,6 +512,7 @@ struct platform_nand_chip { int chip_delay; unsigned int options; @@ -8,14 +13,14 @@ void (*set_parts)(uint64_t size, struct platform_nand_chip *chip); void *priv; ---- a/drivers/mtd/nand/plat_nand.c -+++ b/drivers/mtd/nand/plat_nand.c +--- linux-2.6.35.3.orig/drivers/mtd/nand/plat_nand.c ++++ linux-2.6.35.3/drivers/mtd/nand/plat_nand.c @@ -91,7 +91,18 @@ static int __devinit plat_nand_probe(str } /* Scan to find existance of the device */ -- if (nand_scan(&data->mtd, 1)) { -+ if (nand_scan_ident(&data->mtd, 1, NULL)) { +- if (nand_scan(&data->mtd, pdata->chip.nr_chips)) { ++ if (nand_scan_ident(&data->mtd, pdata->chip.nr_chips, NULL)) { + res = -ENXIO; + goto out; + } |