From aea3acc1f7a0e2c1176298c258a8f4e8e8a7eb92 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Wed, 26 Nov 2008 10:23:25 +0000 Subject: [PATCH] --- yaml --- r: 119790 b: refs/heads/master c: a3d3f73ccbd68b3557c4aaf9f6246ea21d922835 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/mtd/devices/m25p80.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 2353beeba77a..57d72fd17355 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cbbd695687caab1082a70d2ae81153fdba7e851c +refs/heads/master: a3d3f73ccbd68b3557c4aaf9f6246ea21d922835 diff --git a/trunk/drivers/mtd/devices/m25p80.c b/trunk/drivers/mtd/devices/m25p80.c index 76a76751da36..a298fed6ab0c 100644 --- a/trunk/drivers/mtd/devices/m25p80.c +++ b/trunk/drivers/mtd/devices/m25p80.c @@ -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;