diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2008-09-29 01:08:17 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2008-09-29 01:08:17 +0000 |
| commit | bc92b67c41bb9eb64dd342735cf04d0ca5098926 (patch) | |
| tree | fb3cad267265be9ac8eb1532182422f278dc3d0a /target/linux/generic-2.6/patches-2.6.27/080-mtd_plat_nand_chip_fixup.patch | |
| parent | 9b2097af21c4298fb67622266d5587e4e680fc5c (diff) | |
| download | master-31e0f0ae-bc92b67c41bb9eb64dd342735cf04d0ca5098926.tar.gz master-31e0f0ae-bc92b67c41bb9eb64dd342735cf04d0ca5098926.tar.bz2 master-31e0f0ae-bc92b67c41bb9eb64dd342735cf04d0ca5098926.zip | |
port generic and ixp4xx kernel patches to 2.6.27 (compiles except for iptables, but otherwise completely untested)
SVN-Revision: 12790
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.27/080-mtd_plat_nand_chip_fixup.patch')
| -rw-r--r-- | target/linux/generic-2.6/patches-2.6.27/080-mtd_plat_nand_chip_fixup.patch | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.27/080-mtd_plat_nand_chip_fixup.patch b/target/linux/generic-2.6/patches-2.6.27/080-mtd_plat_nand_chip_fixup.patch new file mode 100644 index 0000000000..2b8954c1fb --- /dev/null +++ b/target/linux/generic-2.6/patches-2.6.27/080-mtd_plat_nand_chip_fixup.patch @@ -0,0 +1,32 @@ +--- a/include/linux/mtd/nand.h ++++ b/include/linux/mtd/nand.h +@@ -578,6 +578,7 @@ + int chip_delay; + unsigned int options; + const char **part_probe_types; ++ int (*chip_fixup)(struct mtd_info *mtd); + void *priv; + }; + +--- a/drivers/mtd/nand/plat_nand.c ++++ b/drivers/mtd/nand/plat_nand.c +@@ -71,7 +71,18 @@ + platform_set_drvdata(pdev, data); + + /* Scan to find existance of the device */ +- if (nand_scan(&data->mtd, 1)) { ++ if (nand_scan_ident(&data->mtd, 1)) { ++ res = -ENXIO; ++ goto out; ++ } ++ ++ if (pdata->chip.chip_fixup) { ++ res = pdata->chip.chip_fixup(&data->mtd); ++ if (res) ++ goto out; ++ } ++ ++ if (nand_scan_tail(&data->mtd)) { + res = -ENXIO; + goto out; + } |