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

Commit ea56fb28 authored by Stefan Agner's avatar Stefan Agner Committed by Boris Brezillon
Browse files

mtd: nand: vf610: set correct ooblayout 



With commit 3cf32d18 ("mtd: nand: vf610: switch to
mtd_ooblayout_ops") the driver started to use the NAND cores
default large page ooblayout. However, shortly after commit
6a623e07 ("mtd: nand: add ooblayout for old hamming layout")
changed the default layout to the old hamming layout, which is
not what vf610_nfc is using. Specify the default large page
layout explicitly.

Fixes: 6a623e07 ("mtd: nand: add ooblayout for old hamming layout")
Cc: <stable@vger.kernel.org> # v4.12+
Signed-off-by: default avatarStefan Agner <stefan@agner.ch>
Signed-off-by: default avatarBoris Brezillon <boris.brezillon@bootlin.com>
parent 7928b2cb

drivers/mtd/nand/vf610_nfc.c

+2 −4
Original line number Diff line number Diff line
@@ -752,10 +752,8 @@ static int vf610_nfc_probe(struct platform_device *pdev) 
		if (mtd->oobsize > 64)

			mtd->oobsize = 64;



		/*

		 * mtd->ecclayout is not specified here because we're using the

		 * default large page ECC layout defined in NAND core.

		 */

		/* Use default large page ECC layout defined in NAND core */

		mtd_set_ooblayout(mtd, &nand_ooblayout_lp_ops);

		if (chip->ecc.strength == 32) {

			nfc->ecc_mode = ECC_60_BYTE;

			chip->ecc.bytes = 60;