diff options
author | Felix Fietkau <nbd@openwrt.org> | 2011-04-16 18:31:05 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2011-04-16 18:31:05 +0000 |
commit | c19a05ddc769a8b14837218fea04fe8b5c887eee (patch) | |
tree | d0285c3b8b16f40ed39ca88a77e257f6443ecb57 /target/linux/generic/patches-2.6.39/450-mtd_plat_nand_chip_fixup.patch | |
parent | 80a4ffa1e2bc5f3ef893251babb2371c502f04ad (diff) | |
download | upstream-c19a05ddc769a8b14837218fea04fe8b5c887eee.tar.gz upstream-c19a05ddc769a8b14837218fea04fe8b5c887eee.tar.bz2 upstream-c19a05ddc769a8b14837218fea04fe8b5c887eee.zip |
kernel: reorganize 2.6.39 patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@26691 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-2.6.39/450-mtd_plat_nand_chip_fixup.patch')
-rw-r--r-- | target/linux/generic/patches-2.6.39/450-mtd_plat_nand_chip_fixup.patch | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/target/linux/generic/patches-2.6.39/450-mtd_plat_nand_chip_fixup.patch b/target/linux/generic/patches-2.6.39/450-mtd_plat_nand_chip_fixup.patch new file mode 100644 index 0000000000..0774e8389f --- /dev/null +++ b/target/linux/generic/patches-2.6.39/450-mtd_plat_nand_chip_fixup.patch @@ -0,0 +1,37 @@ +--- + 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 +@@ -625,6 +625,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 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; + } |