generic: 6.1: refresh pending patches

[openwrt/staging/ldir.git] / target / linux / generic / pending-6.1 / 465-m25p80-mx-disable-software-protection.patch

diff --git a/target/linux/generic/pending-6.1/465-m25p80-mx-disable-software-protection.patch b/target/linux/generic/pending-6.1/465-m25p80-mx-disable-software-protection.patch
index f58d5452abe9f2e7c4c21756943c053d779fbc85..1e280773381cc19979dba263215b2c15b582bc56 100644 (file)
--- a/target/linux/generic/pending-6.1/465-m25p80-mx-disable-software-protection.patch
+++ b/target/linux/generic/pending-6.1/465-m25p80-mx-disable-software-protection.patch
@@ -8,11 +8,11 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
 
 --- a/drivers/mtd/spi-nor/macronix.c
 +++ b/drivers/mtd/spi-nor/macronix.c
-@@ -93,6 +93,7 @@ static void macronix_default_init(struct
+@@ -106,6 +106,7 @@ static void macronix_nor_default_init(st
  {
        nor->params->quad_enable = spi_nor_sr1_bit6_quad_enable;
        nor->params->set_4byte_addr_mode = spi_nor_set_4byte_addr_mode;
 +      nor->flags |= SNOR_F_HAS_LOCK;
  }
  
- static const struct spi_nor_fixups macronix_fixups = {
+ static const struct spi_nor_fixups macronix_nor_fixups = {