diff options
| author | Brent Taylor <motobud@gmail.com> | 2017-10-30 22:32:45 -0500 |
|---|---|---|
| committer | Sasha Levin <alexander.levin@verizon.com> | 2017-12-08 18:01:16 -0500 |
| commit | 95dcd5bd1d02720d610ec331738117a5bab47726 (patch) | |
| tree | b4e1f352710938ebdadbc06abaa0d8fc01ce417c | |
| parent | b7937be8df3b7ded0f9f37849e54bd70f11db959 (diff) | |
| download | linux-stable-95dcd5bd1d02720d610ec331738117a5bab47726.tar.gz linux-stable-95dcd5bd1d02720d610ec331738117a5bab47726.tar.bz2 linux-stable-95dcd5bd1d02720d610ec331738117a5bab47726.zip | |
mtd: nand: Fix writing mtdoops to nand flash.
[ Upstream commit 30863e38ebeb500a31cecee8096fb5002677dd9b ]
When mtdoops calls mtd_panic_write(), it eventually calls
panic_nand_write() in nand_base.c. In order to properly wait for the
nand chip to be ready in panic_nand_wait(), the chip must first be
selected.
When using the atmel nand flash controller, a panic would occur due to
a NULL pointer exception.
Fixes: 2af7c6539931 ("mtd: Add panic_write for NAND flashes")
Cc: <stable@vger.kernel.org>
Signed-off-by: Brent Taylor <motobud@gmail.com>
Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
| -rw-r--r-- | drivers/mtd/nand/nand_base.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c index fa5cd51cba38..f84113fc7cb7 100644 --- a/drivers/mtd/nand/nand_base.c +++ b/drivers/mtd/nand/nand_base.c @@ -2518,15 +2518,18 @@ static int panic_nand_write(struct mtd_info *mtd, loff_t to, size_t len, size_t *retlen, const uint8_t *buf) { struct nand_chip *chip = mtd->priv; + int chipnr = (int)(to >> chip->chip_shift); struct mtd_oob_ops ops; int ret; - /* Wait for the device to get ready */ - panic_nand_wait(mtd, chip, 400); - /* Grab the device */ panic_nand_get_device(chip, mtd, FL_WRITING); + chip->select_chip(mtd, chipnr); + + /* Wait for the device to get ready */ + panic_nand_wait(mtd, chip, 400); + memset(&ops, 0, sizeof(ops)); ops.len = len; ops.datbuf = (uint8_t *)buf; |