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
2012-04-25 12:57:29 +00:00 · 2012-04-25 12:57:29 +00:00 · 0965fa8af6
parent 949ba90900
commit 0965fa8af6
1 changed files with 3 additions and 3 deletions
--- 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;
 +	}
 +