Commit 90c31cb9 authored by Boris Brezillon's avatar Boris Brezillon

mtd: spi-nor: Reset nor->addr_width when SFDP parsing failed

Commit 5390a8df ("mtd: spi-nor: add support to non-uniform SFDP SPI
NOR flash memories") removed the 'nor->addr_width = 0;' statement when
spi_nor_parse_sfdp() returns an error, thus leaving ->addr_width in an
undefined state which can cause trouble when spi_nor_scan() checks its
value.
Reported-by: default avatarCyrille Pitchen <cyrille.pitchen@wedev4u.fr>
Fixes: 5390a8df ("mtd: spi-nor: add support to non-uniform SFDP SPI NOR flash memories")
Signed-off-by: default avatarBoris Brezillon <boris.brezillon@bootlin.com>
Reviewed-by: default avatarTudor Ambarus <tudor.ambarus@microchip.com>
parent 91d7b670
...@@ -3250,12 +3250,14 @@ static int spi_nor_init_params(struct spi_nor *nor, ...@@ -3250,12 +3250,14 @@ static int spi_nor_init_params(struct spi_nor *nor,
memcpy(&sfdp_params, params, sizeof(sfdp_params)); memcpy(&sfdp_params, params, sizeof(sfdp_params));
memcpy(&prev_map, &nor->erase_map, sizeof(prev_map)); memcpy(&prev_map, &nor->erase_map, sizeof(prev_map));
if (spi_nor_parse_sfdp(nor, &sfdp_params)) if (spi_nor_parse_sfdp(nor, &sfdp_params)) {
nor->addr_width = 0;
/* restore previous erase map */ /* restore previous erase map */
memcpy(&nor->erase_map, &prev_map, memcpy(&nor->erase_map, &prev_map,
sizeof(nor->erase_map)); sizeof(nor->erase_map));
else } else {
memcpy(params, &sfdp_params, sizeof(*params)); memcpy(params, &sfdp_params, sizeof(*params));
}
} }
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment