kernel: update m25p80 in 4.1 to the latest version from 4.4-rc1

[openwrt/svn-archive/archive.git] / target / linux / brcm63xx / patches-4.1 / 202-MTD-DEVICES-m25p80-use-parsers-if-provided-in-flash-.patch

diff --git a/target/linux/brcm63xx/patches-4.1/202-MTD-DEVICES-m25p80-use-parsers-if-provided-in-flash-.patch b/target/linux/brcm63xx/patches-4.1/202-MTD-DEVICES-m25p80-use-parsers-if-provided-in-flash-.patch
index e58cd5967b239f91c1105fc98f80baea7f96a3ad..be62e6789c883a5854a7bc9fae6dcc882090800f 100644 (file)
--- a/target/linux/brcm63xx/patches-4.1/202-MTD-DEVICES-m25p80-use-parsers-if-provided-in-flash-.patch
+++ b/target/linux/brcm63xx/patches-4.1/202-MTD-DEVICES-m25p80-use-parsers-if-provided-in-flash-.patch
@@ -11,12 +11,12 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
 
 --- a/drivers/mtd/devices/m25p80.c
 +++ b/drivers/mtd/devices/m25p80.c
-@@ -234,7 +234,8 @@ static int m25p_probe(struct spi_device
+@@ -229,7 +229,8 @@ static int m25p_probe(struct spi_device
  
        ppdata.of_node = spi->dev.of_node;
  
--      return mtd_device_parse_register(&flash->mtd, NULL, &ppdata,
-+      return mtd_device_parse_register(&flash->mtd,
+-      return mtd_device_parse_register(&nor->mtd, NULL, &ppdata,
++      return mtd_device_parse_register(&nor->mtd,
 +                      data ? data->part_probe_types : NULL, &ppdata,
                        data ? data->parts : NULL,
                        data ? data->nr_parts : 0);