aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/pending-4.19/466-Revert-mtd-spi-nor-fix-Spansion-regressions-aliased-.patch
diff options
context:
space:
mode:
authorLuka Perkov <luka.perkov@sartura.hr>2019-08-24 23:03:17 +0200
committerLuka Perkov <luka.perkov@sartura.hr>2019-08-24 23:11:15 +0200
commitf4500fde1e1dfd746aa2235c4d0f620ac42d50d4 (patch)
tree938033e8336ab0aab8358503c2def8bd471db764 /target/linux/generic/pending-4.19/466-Revert-mtd-spi-nor-fix-Spansion-regressions-aliased-.patch
parent7dff6a8c89e30e660ef077d31ec0358a04161271 (diff)
downloadupstream-f4500fde1e1dfd746aa2235c4d0f620ac42d50d4.tar.gz
upstream-f4500fde1e1dfd746aa2235c4d0f620ac42d50d4.tar.bz2
upstream-f4500fde1e1dfd746aa2235c4d0f620ac42d50d4.zip
kernel: refresh patches
Signed-off-by: Luka Perkov <luka.perkov@sartura.hr>
Diffstat (limited to 'target/linux/generic/pending-4.19/466-Revert-mtd-spi-nor-fix-Spansion-regressions-aliased-.patch')
-rw-r--r--target/linux/generic/pending-4.19/466-Revert-mtd-spi-nor-fix-Spansion-regressions-aliased-.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/pending-4.19/466-Revert-mtd-spi-nor-fix-Spansion-regressions-aliased-.patch b/target/linux/generic/pending-4.19/466-Revert-mtd-spi-nor-fix-Spansion-regressions-aliased-.patch
index dcb86f69bf..fb6ae7df7b 100644
--- a/target/linux/generic/pending-4.19/466-Revert-mtd-spi-nor-fix-Spansion-regressions-aliased-.patch
+++ b/target/linux/generic/pending-4.19/466-Revert-mtd-spi-nor-fix-Spansion-regressions-aliased-.patch
@@ -17,7 +17,7 @@ Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
--- a/drivers/mtd/spi-nor/spi-nor.c
+++ b/drivers/mtd/spi-nor/spi-nor.c
-@@ -2735,6 +2735,7 @@ static int spi_nor_init(struct spi_nor *
+@@ -2737,6 +2737,7 @@ static int spi_nor_init(struct spi_nor *
JEDEC_MFR(nor->info) == SNOR_MFR_INTEL ||
JEDEC_MFR(nor->info) == SNOR_MFR_MACRONIX ||
JEDEC_MFR(nor->info) == SNOR_MFR_SST ||
@@ -25,7 +25,7 @@ Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
nor->info->flags & SPI_NOR_HAS_LOCK) {
write_enable(nor);
write_sr(nor, 0);
-@@ -2871,7 +2872,8 @@ int spi_nor_scan(struct spi_nor *nor, co
+@@ -2873,7 +2874,8 @@ int spi_nor_scan(struct spi_nor *nor, co
/* NOR protection support for STmicro/Micron chips and similar */
if (JEDEC_MFR(info) == SNOR_MFR_MICRON ||