atm/solos-pci: Fix incorrectly applied patch.

[openwrt.git] / target / linux / generic / patches-2.6.35 / 080-mtd_plat_nand_chip_fixup.patch

diff --git a/target/linux/generic/patches-2.6.35/080-mtd_plat_nand_chip_fixup.patch b/target/linux/generic/patches-2.6.35/080-mtd_plat_nand_chip_fixup.patch
index 6ea82d9..99b4388 100644 (file)
--- a/target/linux/generic/patches-2.6.35/080-mtd_plat_nand_chip_fixup.patch
+++ b/target/linux/generic/patches-2.6.35/080-mtd_plat_nand_chip_fixup.patch
@@ -1,6 +1,11 @@
+---
+ 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
-@@ -491,6 +491,7 @@ struct platform_nand_chip {
+@@ -512,6 +512,7 @@ struct platform_nand_chip {
        int                     chip_delay;
        unsigned int            options;
        const char              **part_probe_types;
@@ -10,12 +15,12 @@
        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
+@@ -96,7 +96,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, NULL)) {
+-      if (nand_scan(&data->mtd, pdata->chip.nr_chips)) {
++      if (nand_scan_ident(&data->mtd, pdata->chip.nr_chips, NULL)) {
 +              res = -ENXIO;
 +              goto out;
 +      }