Skip to content

Commit ac5bfa9

Browse files
mwalleprati0100
authored andcommitted
mtd: spi-nor: fix flash probing
Fix flash probing by name. Flash entries without a name are allowed since commit 15eb830 ("mtd: spi-nor: mark the flash name as obsolete"). But it was just until recently that a flash entry without a name was actually introduced. This triggers a bug in the legacy probe by name path. Skip entries without a name to fix it. Fixes: 2095e7d ("mtd: spi-nor: spansion: Add support for S28HS256T") Reported-by: Jon Hunter <jonathanh@nvidia.com> Closes: https://lore.kernel.org/r/66c8ebb0-1324-4ad9-9926-8d4eb7e1e63a@nvidia.com/ Tested-by: Jon Hunter <jonathanh@nvidia.com> Signed-off-by: Michael Walle <mwalle@kernel.org> Reviewed-by: Tudor Ambarus <tudor.ambarus@linaro.org> Reviewed-by: Pratyush Yadav <pratyush@kernel.org> Signed-off-by: Pratyush Yadav <pratyush@kernel.org> Link: https://lore.kernel.org/r/20240909072854.812206-1-mwalle@kernel.org
1 parent 1dc6cd4 commit ac5bfa9

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

drivers/mtd/spi-nor/core.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3281,7 +3281,8 @@ static const struct flash_info *spi_nor_match_name(struct spi_nor *nor,
32813281

32823282
for (i = 0; i < ARRAY_SIZE(manufacturers); i++) {
32833283
for (j = 0; j < manufacturers[i]->nparts; j++) {
3284-
if (!strcmp(name, manufacturers[i]->parts[j].name)) {
3284+
if (manufacturers[i]->parts[j].name &&
3285+
!strcmp(name, manufacturers[i]->parts[j].name)) {
32853286
nor->manufacturer = manufacturers[i];
32863287
return &manufacturers[i]->parts[j];
32873288
}

0 commit comments

Comments
 (0)