aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2012-04-25 12:57:29 +0000
committerGabor Juhos <juhosg@openwrt.org>2012-04-25 12:57:29 +0000
commit0965fa8af6cd23a5871b3b12053a97c559f97d18 (patch)
treea71569a0a8964ca6ada5197600ef089d44976b51
parent949ba909003e660f2d894b6000e5322c92a09f72 (diff)
downloadupstream-0965fa8af6cd23a5871b3b12053a97c559f97d18.tar.gz
upstream-0965fa8af6cd23a5871b3b12053a97c559f97d18.tar.bz2
upstream-0965fa8af6cd23a5871b3b12053a97c559f97d18.zip
linux/3.3: fix compiler warnings in the plat_nand driver
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31473 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--target/linux/generic/patches-3.3/450-mtd_plat_nand_chip_fixup.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/patches-3.3/450-mtd_plat_nand_chip_fixup.patch b/target/linux/generic/patches-3.3/450-mtd_plat_nand_chip_fixup.patch
index 725877a9fe..fd2b9b57b9 100644
--- a/target/linux/generic/patches-3.3/450-mtd_plat_nand_chip_fixup.patch
+++ b/target/linux/generic/patches-3.3/450-mtd_plat_nand_chip_fixup.patch
@@ -21,13 +21,13 @@
/* 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;
++ err = -ENXIO;
+ goto out;
+ }
+
+ if (pdata->chip.chip_fixup) {
-+ res = pdata->chip.chip_fixup(&data->mtd);
-+ if (res)
++ err = pdata->chip.chip_fixup(&data->mtd);
++ if (err)
+ goto out;
+ }
+