summaryrefslogtreecommitdiffstats
path: root/drivers/mtd/devices
diff options
context:
space:
mode:
authorWill Newton <will.newton@gmail.com>2009-03-10 12:55:53 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-03-10 15:55:11 -0700
commit229cc58ba2b5a83b0b55764c6cb98695c106238a (patch)
tree16816a73113a9f6f961b569c2a09c70a5b075607 /drivers/mtd/devices
parent1b23336ad98b3666c216617227c7767cd60a22be (diff)
downloadop-kernel-dev-229cc58ba2b5a83b0b55764c6cb98695c106238a.zip
op-kernel-dev-229cc58ba2b5a83b0b55764c6cb98695c106238a.tar.gz
mtd_dataflash: fix probing of AT45DB321C chips.
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> Cc: <stable@kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/mtd/devices')
-rw-r--r--drivers/mtd/devices/mtd_dataflash.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/mtd/devices/mtd_dataflash.c b/drivers/mtd/devices/mtd_dataflash.c
index d44f741..6d9f810 100644
--- a/drivers/mtd/devices/mtd_dataflash.c
+++ b/drivers/mtd/devices/mtd_dataflash.c
@@ -821,7 +821,8 @@ static struct flash_info *__devinit jedec_probe(struct spi_device *spi)
if (!(info->flags & IS_POW2PS))
return info;
}
- }
+ } else
+ return info;
}
}
OpenPOWER on IntegriCloud