diff options
| author | matteo <matteo@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-02-28 15:20:00 +0000 |
|---|---|---|
| committer | matteo <matteo@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-02-28 15:20:00 +0000 |
| commit | 277b4f4f307b33f0d51359a82e868a1783f4e62f (patch) | |
| tree | c49ac1a86a7262dd17d7b4c0af3c151c37338619 /target/linux/generic-2.6/patches-2.6.33/080-mtd_plat_nand_chip_fixup.patch | |
| parent | 6f36c97668a24018e253750daac4be140dce45c7 (diff) | |
kernel: add 2.6.33 patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@19905 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.33/080-mtd_plat_nand_chip_fixup.patch')
| -rw-r--r-- | target/linux/generic-2.6/patches-2.6.33/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.33/080-mtd_plat_nand_chip_fixup.patch b/target/linux/generic-2.6/patches-2.6.33/080-mtd_plat_nand_chip_fixup.patch new file mode 100644 index 000000000..16ce76ce8 --- /dev/null +++ b/target/linux/generic-2.6/patches-2.6.33/080-mtd_plat_nand_chip_fixup.patch @@ -0,0 +1,32 @@ +--- 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)) { ++ 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; + } |