Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 119790
b: refs/heads/master
c: a3d3f73
h: refs/heads/master
v: v3
  • Loading branch information
Mike Frysinger authored and David Woodhouse committed Nov 26, 2008
1 parent d6fd0ee commit aea3acc
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: cbbd695687caab1082a70d2ae81153fdba7e851c
refs/heads/master: a3d3f73ccbd68b3557c4aaf9f6246ea21d922835
3 changes: 2 additions & 1 deletion trunk/drivers/mtd/devices/m25p80.c
Original file line number Diff line number Diff line change
Expand Up @@ -574,10 +574,11 @@ static struct flash_info *__devinit jedec_probe(struct spi_device *spi)
for (tmp = 0, info = m25p_data;
tmp < ARRAY_SIZE(m25p_data);
tmp++, info++) {
if (info->jedec_id == jedec)
if (info->jedec_id == jedec) {
if (ext_jedec != 0 && info->ext_id != ext_jedec)
continue;
return info;
}
}
dev_err(&spi->dev, "unrecognized JEDEC id %06x\n", jedec);
return NULL;
Expand Down

0 comments on commit aea3acc

Please sign in to comment.