X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=blobdiff_plain;f=target%2Flinux%2Fgeneric-2.6%2Fpatches-2.6.35%2F080-mtd_plat_nand_chip_fixup.patch;fp=target%2Flinux%2Fgeneric-2.6%2Fpatches-2.6.35%2F080-mtd_plat_nand_chip_fixup.patch;h=0000000000000000000000000000000000000000;hp=6ea82d96aad11eab7a5806b5b0d751806d0094fe;hb=da1bb88a2b900f0392b731ec47c5e1bff956fd8f;hpb=6117c04c9416b295347fb45c37e430f01df1d0d9

diff --git a/target/linux/generic-2.6/patches-2.6.35/080-mtd_plat_nand_chip_fixup.patch b/target/linux/generic-2.6/patches-2.6.35/080-mtd_plat_nand_chip_fixup.patch
deleted file mode 100644
index 6ea82d96aa..0000000000
--- a/target/linux/generic-2.6/patches-2.6.35/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
-@@ -491,6 +491,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
-@@ -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)) {
-+		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;
- 	}