summaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.2/450-mtd_plat_nand_chip_fixup.patch
diff options
context:
space:
mode:
authorjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-05-27 15:01:37 +0000
committerjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-05-27 15:01:37 +0000
commitfe77f5d92219c04614c22fd46d1c521dfe72cd7b (patch)
treec3e80a16d0b4070af1ea473d644981d1df410c54 /target/linux/generic/patches-3.2/450-mtd_plat_nand_chip_fixup.patch
parent1ee6958324f44923ed309d2fa911fc432f514694 (diff)
linux/3.2: R.I.P.
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31905 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.2/450-mtd_plat_nand_chip_fixup.patch')
-rw-r--r--target/linux/generic/patches-3.2/450-mtd_plat_nand_chip_fixup.patch37
1 files changed, 0 insertions, 37 deletions
diff --git a/target/linux/generic/patches-3.2/450-mtd_plat_nand_chip_fixup.patch b/target/linux/generic/patches-3.2/450-mtd_plat_nand_chip_fixup.patch
deleted file mode 100644
index ee778d0f9..000000000
--- a/target/linux/generic/patches-3.2/450-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
-@@ -621,6 +621,7 @@ struct platform_nand_chip {
- unsigned int options;
- unsigned int bbt_options;
- const char **part_probe_types;
-+ int (*chip_fixup)(struct mtd_info *mtd);
- };
-
- /* Keep gcc happy */
---- a/drivers/mtd/nand/plat_nand.c
-+++ b/drivers/mtd/nand/plat_nand.c
-@@ -93,7 +93,18 @@ static int __devinit plat_nand_probe(str
- }
-
- /* Scan to find existence 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;
- }