aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ar71xx
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@nbd.name>2018-02-23 17:33:21 +0100
committerFelix Fietkau <nbd@nbd.name>2018-02-26 19:20:06 +0100
commita49f6565b34c7defbe66cd03c2cb04752ec4dbe6 (patch)
tree5f9c2c58638362ad0408b732c565bd3a3cc8fb21 /target/linux/ar71xx
parent25aaff9100065dba881be71b9dcab1e9cc8a7b5f (diff)
downloadupstream-a49f6565b34c7defbe66cd03c2cb04752ec4dbe6.tar.gz
upstream-a49f6565b34c7defbe66cd03c2cb04752ec4dbe6.tar.bz2
upstream-a49f6565b34c7defbe66cd03c2cb04752ec4dbe6.zip
kernel: m25p80: allow fallback from spi_flash_read to regular SPI transfer
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Diffstat (limited to 'target/linux/ar71xx')
-rw-r--r--target/linux/ar71xx/patches-4.9/407-mtd-m25p80-allow-to-pass-probe-types-via-platform-data.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/ar71xx/patches-4.9/407-mtd-m25p80-allow-to-pass-probe-types-via-platform-data.patch b/target/linux/ar71xx/patches-4.9/407-mtd-m25p80-allow-to-pass-probe-types-via-platform-data.patch
index 4fa957e70b..418db2a2bf 100644
--- a/target/linux/ar71xx/patches-4.9/407-mtd-m25p80-allow-to-pass-probe-types-via-platform-data.patch
+++ b/target/linux/ar71xx/patches-4.9/407-mtd-m25p80-allow-to-pass-probe-types-via-platform-data.patch
@@ -1,6 +1,6 @@
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
-@@ -192,6 +192,7 @@ static ssize_t m25p80_read(struct spi_no
+@@ -194,6 +194,7 @@ static ssize_t m25p80_read(struct spi_no
*/
static int m25p_probe(struct spi_device *spi)
{
@@ -8,7 +8,7 @@
struct flash_platform_data *data;
struct m25p *flash;
struct spi_nor *nor;
-@@ -244,8 +245,11 @@ static int m25p_probe(struct spi_device
+@@ -246,8 +247,11 @@ static int m25p_probe(struct spi_device
if (ret)
return ret;