diff options
author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2020-02-21 15:10:15 +0100 |
---|---|---|
committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2020-02-24 14:21:08 +0100 |
commit | fafe99b62d9c6e5ec3233d221113972023773450 (patch) | |
tree | c14c0f580d2f2a290ca0029f9734370e65799411 /target/linux/ramips/patches-4.14/0053-mtd-spi-nor-add-w25q256-3b-mode-switch.patch | |
parent | bfee12cec638eed9b2197e3a12570a678839a1eb (diff) | |
download | upstream-fafe99b62d9c6e5ec3233d221113972023773450.tar.gz upstream-fafe99b62d9c6e5ec3233d221113972023773450.tar.bz2 upstream-fafe99b62d9c6e5ec3233d221113972023773450.zip |
kernel: bump 4.14 to 4.14.171
Refreshed all patches.
Fixes:
- CVE-2013-1798
Compile-tested on: cns3xxx
Runtime-tested on: cns3xxx
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/ramips/patches-4.14/0053-mtd-spi-nor-add-w25q256-3b-mode-switch.patch')
-rw-r--r-- | target/linux/ramips/patches-4.14/0053-mtd-spi-nor-add-w25q256-3b-mode-switch.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/target/linux/ramips/patches-4.14/0053-mtd-spi-nor-add-w25q256-3b-mode-switch.patch b/target/linux/ramips/patches-4.14/0053-mtd-spi-nor-add-w25q256-3b-mode-switch.patch index 02b6ffbc2a..fdac13fb5a 100644 --- a/target/linux/ramips/patches-4.14/0053-mtd-spi-nor-add-w25q256-3b-mode-switch.patch +++ b/target/linux/ramips/patches-4.14/0053-mtd-spi-nor-add-w25q256-3b-mode-switch.patch @@ -116,7 +116,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> spi_nor_unlock_and_unprep(nor, SPI_NOR_OPS_LOCK); return ret; -@@ -1175,7 +1227,7 @@ static const struct flash_info spi_nor_i +@@ -1180,7 +1232,7 @@ static const struct flash_info spi_nor_i { "w25q80", INFO(0xef5014, 0, 64 * 1024, 16, SECT_4K) }, { "w25q80bl", INFO(0xef4014, 0, 64 * 1024, 16, SECT_4K) }, { "w25q128", INFO(0xef4018, 0, 64 * 1024, 256, SECT_4K) }, @@ -125,7 +125,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> { "w25m512jv", INFO(0xef7119, 0, 64 * 1024, 1024, SECT_4K | SPI_NOR_QUAD_READ | SPI_NOR_DUAL_READ) }, -@@ -1235,6 +1287,9 @@ static int spi_nor_read(struct mtd_info +@@ -1240,6 +1292,9 @@ static int spi_nor_read(struct mtd_info if (ret) return ret; @@ -135,7 +135,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> while (len) { loff_t addr = from; -@@ -1259,6 +1314,18 @@ static int spi_nor_read(struct mtd_info +@@ -1264,6 +1319,18 @@ static int spi_nor_read(struct mtd_info ret = 0; read_err: @@ -154,7 +154,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> spi_nor_unlock_and_unprep(nor, SPI_NOR_OPS_READ); return ret; } -@@ -1360,6 +1427,10 @@ static int spi_nor_write(struct mtd_info +@@ -1365,6 +1432,10 @@ static int spi_nor_write(struct mtd_info if (ret) return ret; @@ -165,7 +165,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> for (i = 0; i < len; ) { ssize_t written; loff_t addr = to + i; -@@ -1400,6 +1471,7 @@ static int spi_nor_write(struct mtd_info +@@ -1405,6 +1476,7 @@ static int spi_nor_write(struct mtd_info } write_err: @@ -173,7 +173,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> spi_nor_unlock_and_unprep(nor, SPI_NOR_OPS_WRITE); return ret; } -@@ -2816,8 +2888,10 @@ int spi_nor_scan(struct spi_nor *nor, co +@@ -2821,8 +2893,10 @@ int spi_nor_scan(struct spi_nor *nor, co } else if (mtd->size > 0x1000000) { /* enable 4-byte addressing if the device exceeds 16MiB */ nor->addr_width = 4; |