From: Gabor Juhos <juhosg@openwrt.org>
Date: Wed, 25 Apr 2012 12:57:29 +0000 (+0000)
Subject: linux/3.3: fix compiler warnings in the plat_nand driver
X-Git-Tag: reboot~14147
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=43d67fa995bb1b4073d345a08f23b25cf2ee62a1;p=openwrt%2Fstaging%2Fjogo.git

linux/3.3: fix compiler warnings in the plat_nand driver

SVN-Revision: 31473
---

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;
 +	}
 +