diff options
author | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-04-29 15:00:33 +0000 |
---|---|---|
committer | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-04-29 15:00:33 +0000 |
commit | afab35ea6e8ea901d900672119dec239ef27e26a (patch) | |
tree | 8ced7371de81d240795bd32cefde6e9bc16b8d7a /target/linux/generic/patches-2.6.36/080-mtd_plat_nand_chip_fixup.patch | |
parent | b2fc0c642344bd94607c6214a0ede5addd3bf5a9 (diff) |
linux/2.6.36: R.I.P.
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31519 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-2.6.36/080-mtd_plat_nand_chip_fixup.patch')
-rw-r--r-- | target/linux/generic/patches-2.6.36/080-mtd_plat_nand_chip_fixup.patch | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/target/linux/generic/patches-2.6.36/080-mtd_plat_nand_chip_fixup.patch b/target/linux/generic/patches-2.6.36/080-mtd_plat_nand_chip_fixup.patch deleted file mode 100644 index d1e53db63..000000000 --- a/target/linux/generic/patches-2.6.36/080-mtd_plat_nand_chip_fixup.patch +++ /dev/null @@ -1,37 +0,0 @@ ---- - drivers/mtd/nand/plat_nand.c | 13 ++++++++++++- - include/linux/mtd/nand.h | 1 + - 2 files changed, 13 insertions(+), 1 deletion(-) - ---- a/include/linux/mtd/nand.h -+++ b/include/linux/mtd/nand.h -@@ -510,6 +510,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 -@@ -96,7 +96,18 @@ static int __devinit plat_nand_probe(str - } - - /* Scan to find existance of the device */ -- if (nand_scan(&data->mtd, pdata->chip.nr_chips)) { -+ if (nand_scan_ident(&data->mtd, pdata->chip.nr_chips, NULL)) { -+ 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)) { - err = -ENXIO; - goto out; - } |