aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorKevin Cernekee <cernekee@gmail.com>2010-10-31 00:11:02 -0400
committerDavid Woodhouse <David.Woodhouse@intel.com>2010-12-03 11:26:08 -0500
commitf0dff9bd00d2cffea160fb3fa015b77607458634 (patch)
treeb3544ddcb2e4e9659530a189ba8021779d836d30 /drivers
parentb7b6e08f9265db56129931983fc6c06d62c9f4f9 (diff)
mtd: m25p80: Reinstate error print on unrecognized flash
Commit b34bc037b26e621e5fc13466767e4da110a7b3d3 removed the "unrecognized JEDEC id" error message, causing the probe function to silently abort if the flash ID is unrecognized. It is desirable to produce diagnostic output in this situation so that the user has some idea what went wrong. Signed-off-by: Kevin Cernekee <cernekee@gmail.com> Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com> Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/mtd/devices/m25p80.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c
index bf5a002209bd..80404e1a4d5e 100644
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
@@ -764,6 +764,7 @@ static const struct spi_device_id *__devinit jedec_probe(struct spi_device *spi)
764 return &m25p_ids[tmp]; 764 return &m25p_ids[tmp];
765 } 765 }
766 } 766 }
767 dev_err(&spi->dev, "unrecognized JEDEC id %06x\n", jedec);
767 return ERR_PTR(-ENODEV); 768 return ERR_PTR(-ENODEV);
768} 769}
769 770