diff options
author | Ansuel Smith <ansuelsmth@gmail.com> | 2022-03-21 15:22:20 +0100 |
---|---|---|
committer | Daniel Golle <daniel@makrotopia.org> | 2022-03-27 05:00:50 +0100 |
commit | 009f8afe06258adff30d83e936d097e42d5501ca (patch) | |
tree | 8d8059364dd135646aae277ace45e77674c19865 /target/linux/generic/pending-5.15/402-mtd-spi-nor-write-support-for-minor-aligned-partitions.patch | |
parent | 49cb5e501a8d6eb8ff5cad63f13282de7b84e7ef (diff) | |
download | upstream-009f8afe06258adff30d83e936d097e42d5501ca.tar.gz upstream-009f8afe06258adff30d83e936d097e42d5501ca.tar.bz2 upstream-009f8afe06258adff30d83e936d097e42d5501ca.zip |
generic: 5.15: refresh pending patch
Use 'make target/linux/refresh' to refresh pending patches.
Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
Diffstat (limited to 'target/linux/generic/pending-5.15/402-mtd-spi-nor-write-support-for-minor-aligned-partitions.patch')
-rw-r--r-- | target/linux/generic/pending-5.15/402-mtd-spi-nor-write-support-for-minor-aligned-partitions.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/generic/pending-5.15/402-mtd-spi-nor-write-support-for-minor-aligned-partitions.patch b/target/linux/generic/pending-5.15/402-mtd-spi-nor-write-support-for-minor-aligned-partitions.patch index eaf96e9534..58c33bcd69 100644 --- a/target/linux/generic/pending-5.15/402-mtd-spi-nor-write-support-for-minor-aligned-partitions.patch +++ b/target/linux/generic/pending-5.15/402-mtd-spi-nor-write-support-for-minor-aligned-partitions.patch @@ -338,7 +338,7 @@ Reported-by: Dan Carpenter <dan.carpenter@oracle.com> default y --- a/drivers/mtd/spi-nor/core.c +++ b/drivers/mtd/spi-nor/core.c -@@ -1075,6 +1075,8 @@ static u8 spi_nor_convert_3to4_erase(u8 +@@ -1262,6 +1262,8 @@ static u8 spi_nor_convert_3to4_erase(u8 static bool spi_nor_has_uniform_erase(const struct spi_nor *nor) { @@ -347,7 +347,7 @@ Reported-by: Dan Carpenter <dan.carpenter@oracle.com> return !!nor->params->erase_map.uniform_erase_type; } -@@ -2560,6 +2562,7 @@ static int spi_nor_select_erase(struct s +@@ -2379,6 +2381,7 @@ static int spi_nor_select_erase(struct s { struct spi_nor_erase_map *map = &nor->params->erase_map; const struct spi_nor_erase_type *erase = NULL; @@ -355,7 +355,7 @@ Reported-by: Dan Carpenter <dan.carpenter@oracle.com> struct mtd_info *mtd = &nor->mtd; u32 wanted_size = nor->info->sector_size; int i; -@@ -2592,8 +2595,9 @@ static int spi_nor_select_erase(struct s +@@ -2411,8 +2414,9 @@ static int spi_nor_select_erase(struct s */ for (i = SNOR_ERASE_TYPE_MAX - 1; i >= 0; i--) { if (map->erase_type[i].size) { @@ -367,7 +367,7 @@ Reported-by: Dan Carpenter <dan.carpenter@oracle.com> } } -@@ -2601,6 +2605,8 @@ static int spi_nor_select_erase(struct s +@@ -2420,6 +2424,8 @@ static int spi_nor_select_erase(struct s return -EINVAL; mtd->erasesize = erase->size; @@ -378,7 +378,7 @@ Reported-by: Dan Carpenter <dan.carpenter@oracle.com> --- a/include/linux/mtd/mtd.h +++ b/include/linux/mtd/mtd.h -@@ -242,6 +242,8 @@ struct mtd_info { +@@ -243,6 +243,8 @@ struct mtd_info { * information below if they desire */ uint32_t erasesize; |