|
@@ -193,7 +193,7 @@ Reported-by: Dan Carpenter <[email protected]>
|
|
default y
|
|
default y
|
|
--- a/drivers/mtd/spi-nor/core.c
|
|
--- a/drivers/mtd/spi-nor/core.c
|
|
+++ b/drivers/mtd/spi-nor/core.c
|
|
+++ b/drivers/mtd/spi-nor/core.c
|
|
-@@ -1049,6 +1049,8 @@ static u8 spi_nor_convert_3to4_erase(u8
|
|
|
|
|
|
+@@ -1050,6 +1050,8 @@ static u8 spi_nor_convert_3to4_erase(u8
|
|
|
|
|
|
static bool spi_nor_has_uniform_erase(const struct spi_nor *nor)
|
|
static bool spi_nor_has_uniform_erase(const struct spi_nor *nor)
|
|
{
|
|
{
|
|
@@ -202,7 +202,7 @@ Reported-by: Dan Carpenter <[email protected]>
|
|
return !!nor->params->erase_map.uniform_erase_type;
|
|
return !!nor->params->erase_map.uniform_erase_type;
|
|
}
|
|
}
|
|
|
|
|
|
-@@ -2157,6 +2159,7 @@ static int spi_nor_select_erase(struct s
|
|
|
|
|
|
+@@ -2158,6 +2160,7 @@ static int spi_nor_select_erase(struct s
|
|
{
|
|
{
|
|
struct spi_nor_erase_map *map = &nor->params->erase_map;
|
|
struct spi_nor_erase_map *map = &nor->params->erase_map;
|
|
const struct spi_nor_erase_type *erase = NULL;
|
|
const struct spi_nor_erase_type *erase = NULL;
|
|
@@ -210,7 +210,7 @@ Reported-by: Dan Carpenter <[email protected]>
|
|
struct mtd_info *mtd = &nor->mtd;
|
|
struct mtd_info *mtd = &nor->mtd;
|
|
u32 wanted_size = nor->info->sector_size;
|
|
u32 wanted_size = nor->info->sector_size;
|
|
int i;
|
|
int i;
|
|
-@@ -2189,8 +2192,9 @@ static int spi_nor_select_erase(struct s
|
|
|
|
|
|
+@@ -2190,8 +2193,9 @@ static int spi_nor_select_erase(struct s
|
|
*/
|
|
*/
|
|
for (i = SNOR_ERASE_TYPE_MAX - 1; i >= 0; i--) {
|
|
for (i = SNOR_ERASE_TYPE_MAX - 1; i >= 0; i--) {
|
|
if (map->erase_type[i].size) {
|
|
if (map->erase_type[i].size) {
|
|
@@ -222,7 +222,7 @@ Reported-by: Dan Carpenter <[email protected]>
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
-@@ -2198,6 +2202,9 @@ static int spi_nor_select_erase(struct s
|
|
|
|
|
|
+@@ -2199,6 +2203,9 @@ static int spi_nor_select_erase(struct s
|
|
return -EINVAL;
|
|
return -EINVAL;
|
|
|
|
|
|
mtd->erasesize = erase->size;
|
|
mtd->erasesize = erase->size;
|