| Message ID | 71b06d847f5e19143beb50ce56ed7d13e9998583.1460567255.git.cyrille.pitchen@atmel.com |
|---|---|
| State | Superseded |
| Headers | show |
diff --git a/drivers/mtd/spi-nor/spi-nor.c b/drivers/mtd/spi-nor/spi-nor.c index 4606eac237fe..aac291a590e1 100644 --- a/drivers/mtd/spi-nor/spi-nor.c +++ b/drivers/mtd/spi-nor/spi-nor.c @@ -1359,7 +1359,8 @@ int spi_nor_scan(struct spi_nor *nor, const char *name, enum read_mode mode) jinfo = spi_nor_read_id(nor); if (IS_ERR(jinfo)) { return PTR_ERR(jinfo); - } else if (jinfo != info) { + } else if (jinfo->id_len != info->id_len || + memcmp(jinfo->id, info->id, info->id_len)) { /* * JEDEC knows better, so overwrite platform ID. We * can't trust partitions any longer, but we'll let
Some SPI memories like Macronix MX25L25635E and MX25L25673G share the very same JEDEC ID with no ext ID but provide different hardware capabilities. For instance, the 35E revision doesn't support the dedicated 4byte address opcodes for (Fast) Read, Page Program and Sector Erase operations whereas the 73G does. The 'name' argument of spi_nor_scan() is used by spi_nor_match_id() to look the right entry up. Later, spi_nor_read_id() is called to check whether the actual JEDEC ID read from the hardware matches the one associated with the struct flash_info pointer returned by spi_nor_match_id(). However this check was done by comparing the jinfo and info struct flash_info pointers. Since these pointer values might be different now, the updated code checks the values of the id_len and id fields, which should be the same for all entries associated to the same JEDEC ID. Signed-off-by: Cyrille Pitchen <cyrille.pitchen@atmel.com> --- drivers/mtd/spi-nor/spi-nor.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)