Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 30863e38 authored by Brent Taylor's avatar Brent Taylor Committed by Boris Brezillon
Browse files

mtd: nand: Fix writing mtdoops to nand flash. 



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: 2af7c653 ("mtd: Add panic_write for NAND flashes")
Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarBrent Taylor <motobud@gmail.com>
Signed-off-by: default avatarBoris Brezillon <boris.brezillon@free-electrons.com>
parent 1d2fcdcf

drivers/mtd/nand/nand_base.c

+6 −3
Original line number Diff line number Diff line
@@ -2799,15 +2799,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_to_nand(mtd);

	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;