Skip to content

Commit

Permalink
mtd: spi-nor: Reset nor->addr_width when SFDP parsing failed
Browse files Browse the repository at this point in the history
Commit 5390a8d ("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: Cyrille Pitchen <cyrille.pitchen@wedev4u.fr>
Fixes: 5390a8d ("mtd: spi-nor: add support to non-uniform SFDP SPI NOR flash memories")
Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
Reviewed-by: Tudor Ambarus <tudor.ambarus@microchip.com>
  • Loading branch information
Boris Brezillon committed Nov 5, 2018
1 parent 91d7b67 commit 90c31cb
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions drivers/mtd/spi-nor/spi-nor.c
Original file line number Diff line number Diff line change
Expand Up @@ -3250,12 +3250,14 @@ static int spi_nor_init_params(struct spi_nor *nor,
memcpy(&sfdp_params, params, sizeof(sfdp_params));
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 */
memcpy(&nor->erase_map, &prev_map,
sizeof(nor->erase_map));
else
} else {
memcpy(params, &sfdp_params, sizeof(*params));
}
}

return 0;
Expand Down

0 comments on commit 90c31cb

Please sign in to comment.