X-Git-Url: https://git.librecmc.org/?p=librecmc%2Flibrecmc.git;a=blobdiff_plain;f=target%2Flinux%2Fgeneric%2Fpatches-4.4%2F465-m25p80-mx-disable-software-protection.patch;h=89bafa83875ef7a3bfb4cc2ecf57fa7ff58007ba;hp=070f4c6023d011994e4e8dff201be10537e1a95b;hb=71a6d1298d2facc6fe909e934da9fee9daf5f271;hpb=82d2e430104cd3e8ad69346edf1966a3cd07e2b4

diff --git a/target/linux/generic/patches-4.4/465-m25p80-mx-disable-software-protection.patch b/target/linux/generic/patches-4.4/465-m25p80-mx-disable-software-protection.patch
index 070f4c6023..89bafa8387 100644
--- a/target/linux/generic/patches-4.4/465-m25p80-mx-disable-software-protection.patch
+++ b/target/linux/generic/patches-4.4/465-m25p80-mx-disable-software-protection.patch
@@ -4,11 +4,11 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
 
 --- a/drivers/mtd/spi-nor/spi-nor.c
 +++ b/drivers/mtd/spi-nor/spi-nor.c
-@@ -1158,6 +1158,7 @@ int spi_nor_scan(struct spi_nor *nor, co
+@@ -1159,6 +1159,7 @@ int spi_nor_scan(struct spi_nor *nor, co
  
  	if (JEDEC_MFR(info) == SNOR_MFR_ATMEL ||
  	    JEDEC_MFR(info) == SNOR_MFR_INTEL ||
 +	    JEDEC_MFR(info) == SNOR_MFR_MACRONIX ||
- 	    JEDEC_MFR(info) == SNOR_MFR_SST) {
+ 	    JEDEC_MFR(info) == SNOR_MFR_SST ||
+ 	    info->flags & SPI_NOR_HAS_LOCK) {
  		write_enable(nor);
- 		write_sr(nor, 0);