diff options
| author | Will Newton <will.newton@gmail.com> | 2009-03-10 12:55:53 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-03-16 17:32:18 -0700 |
| commit | a96e5528abe51b9c35e33fcac05e84bca18cefe5 (patch) | |
| tree | 1011941cfcd5de173583123f9e2da4f1f843c45c /drivers | |
| parent | ca912f23933fd14fcab90465af245597dbee9272 (diff) | |
| download | linux-stable-a96e5528abe51b9c35e33fcac05e84bca18cefe5.tar.gz | |
mtd_dataflash: fix probing of AT45DB321C chips.
commit 229cc58ba2b5a83b0b55764c6cb98695c106238a upstream.
Commit 771999b65f79264acde4b855e5d35696eca5e80c ("[MTD] DataFlash: bugfix,
binary page sizes now handled") broke support for probing AT45DB321C flash
chips. These chips do not support the "page size" status bit, so if we
match the JEDEC id return early.
[akpm@linux-foundation.org: coding-style fixes]
Signed-off-by: Will Newton <will.newton@gmail.com>
Cc: David Woodhouse <dwmw2@infradead.org>
Acked-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mtd/devices/mtd_dataflash.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/mtd/devices/mtd_dataflash.c b/drivers/mtd/devices/mtd_dataflash.c index 6dd9aff8bb2d..18cba9e090ba 100644 --- a/drivers/mtd/devices/mtd_dataflash.c +++ b/drivers/mtd/devices/mtd_dataflash.c @@ -815,7 +815,8 @@ static struct flash_info *__devinit jedec_probe(struct spi_device *spi) if (!(info->flags & IS_POW2PS)) return info; } - } + } else + return info; } } |