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

[oweals/openwrt.git] / target / linux / ar71xx / patches-4.1 / 407-mtd-m25p80-allow-to-pass-probe-types-via-platform-data.patch

diff --git a/target/linux/ar71xx/patches-4.1/407-mtd-m25p80-allow-to-pass-probe-types-via-platform-data.patch b/target/linux/ar71xx/patches-4.1/407-mtd-m25p80-allow-to-pass-probe-types-via-platform-data.patch
index bdfa887a8967c53c316f3b35ae5dab98ee675561..6a9132032ff1cefae213464d3212ef0d4e4b8011 100644 (file)
--- a/target/linux/ar71xx/patches-4.1/407-mtd-m25p80-allow-to-pass-probe-types-via-platform-data.patch
+++ b/target/linux/ar71xx/patches-4.1/407-mtd-m25p80-allow-to-pass-probe-types-via-platform-data.patch
@@ -1,11 +1,11 @@
 --- a/drivers/mtd/devices/m25p80.c
 +++ b/drivers/mtd/devices/m25p80.c
-@@ -234,7 +234,9 @@ static int m25p_probe(struct spi_device
+@@ -229,7 +229,9 @@ 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_probes : NULL,
 +                      &ppdata,
                        data ? data->parts : NULL,