diff options
author | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-04-21 15:18:58 +0000 |
---|---|---|
committer | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-04-21 15:18:58 +0000 |
commit | 407157942b2a0d7e74a9223dfc2601eae33ce438 (patch) | |
tree | 0e367872a6fa6b1a5fbe15dba5a3f243dda26c6c /target/linux/generic/patches-2.6.31/080-mtd_plat_nand_chip_fixup.patch | |
parent | f480dd5941ebd6ea9622715f7b8d1e240d01c903 (diff) |
linux/2.6.31: R.I.P.
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31412 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-2.6.31/080-mtd_plat_nand_chip_fixup.patch')
-rw-r--r-- | target/linux/generic/patches-2.6.31/080-mtd_plat_nand_chip_fixup.patch | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/target/linux/generic/patches-2.6.31/080-mtd_plat_nand_chip_fixup.patch b/target/linux/generic/patches-2.6.31/080-mtd_plat_nand_chip_fixup.patch deleted file mode 100644 index 2566151ef..000000000 --- a/target/linux/generic/patches-2.6.31/080-mtd_plat_nand_chip_fixup.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- a/include/linux/mtd/nand.h -+++ b/include/linux/mtd/nand.h -@@ -575,6 +575,7 @@ struct platform_nand_chip { - int chip_delay; - unsigned int options; - const char **part_probe_types; -+ int (*chip_fixup)(struct mtd_info *mtd); - 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 -@@ -80,7 +80,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)) { -+ 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; - } |