| From 61002129d6ee6993d7986b0be19dc11b2627f2d6 Mon Sep 17 00:00:00 2001 |
| From: Axel Lin <axel.lin@ingics.com> |
| Date: Tue, 21 Jan 2014 15:56:34 +0800 |
| Subject: mtd: m25p80: Use positive logic to check JEDEC ID |
| |
| For slightly better readability. |
| |
| Signed-off-by: Axel Lin <axel.lin@ingics.com> |
| Signed-off-by: Brian Norris <computersforpeace@gmail.com> |
| (cherry picked from commit b2fda1296bb8e213a6bad3937326ae98c4c4773c) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| drivers/mtd/devices/m25p80.c | 5 ++--- |
| 1 file changed, 2 insertions(+), 3 deletions(-) |
| |
| diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c |
| index 1e147a849c35..c6e6d8e8ef7b 100644 |
| --- a/drivers/mtd/devices/m25p80.c |
| +++ b/drivers/mtd/devices/m25p80.c |
| @@ -1078,9 +1078,8 @@ static const struct spi_device_id *jedec_probe(struct spi_device *spi) |
| for (tmp = 0; tmp < ARRAY_SIZE(m25p_ids) - 1; tmp++) { |
| info = (void *)m25p_ids[tmp].driver_data; |
| if (info->jedec_id == jedec) { |
| - if (info->ext_id != 0 && info->ext_id != ext_jedec) |
| - continue; |
| - return &m25p_ids[tmp]; |
| + if (info->ext_id == 0 || info->ext_id == ext_jedec) |
| + return &m25p_ids[tmp]; |
| } |
| } |
| dev_err(&spi->dev, "unrecognized JEDEC id %06x\n", jedec); |
| -- |
| 2.1.2 |
| |
