aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-4.9/465-m25p80-mx-disable-software-protection.patch
diff options
context:
space:
mode:
authorRafał Miłecki <rafal@milecki.pl>2017-02-07 13:09:50 +0100
committerRafał Miłecki <rafal@milecki.pl>2017-02-07 15:35:39 +0100
commit174ce4c56d742712696e546eecee3d89e05c909a (patch)
treebe0159e023e7ffe3c922ec183496768a0f2e4db9 /target/linux/generic/patches-4.9/465-m25p80-mx-disable-software-protection.patch
parent6d5419d96ad7d6f2b6de112e8f8ba1f74ceb33d3 (diff)
downloadupstream-174ce4c56d742712696e546eecee3d89e05c909a.tar.gz
upstream-174ce4c56d742712696e546eecee3d89e05c909a.tar.bz2
upstream-174ce4c56d742712696e546eecee3d89e05c909a.zip
kernel: update spi-nor in 4.9 to spi-nor tree version (next branch)
These are patches queued for 4.11. It adds support for even more hw and removes some annoying WARN_ONCE. Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
Diffstat (limited to 'target/linux/generic/patches-4.9/465-m25p80-mx-disable-software-protection.patch')
-rw-r--r--target/linux/generic/patches-4.9/465-m25p80-mx-disable-software-protection.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/target/linux/generic/patches-4.9/465-m25p80-mx-disable-software-protection.patch b/target/linux/generic/patches-4.9/465-m25p80-mx-disable-software-protection.patch
index 0fe722487b..b42ff2e399 100644
--- a/target/linux/generic/patches-4.9/465-m25p80-mx-disable-software-protection.patch
+++ b/target/linux/generic/patches-4.9/465-m25p80-mx-disable-software-protection.patch
@@ -4,7 +4,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
--- a/drivers/mtd/spi-nor/spi-nor.c
+++ b/drivers/mtd/spi-nor/spi-nor.c
-@@ -1368,6 +1368,7 @@ int spi_nor_scan(struct spi_nor *nor, co
+@@ -1588,6 +1588,7 @@ int spi_nor_scan(struct spi_nor *nor, co
if (JEDEC_MFR(info) == SNOR_MFR_ATMEL ||
JEDEC_MFR(info) == SNOR_MFR_INTEL ||