mtd: nand: vf610: set correct ooblayout

[Linux-MTD Mailing List]

Gitweb:     http://git.infradead.org/?p=mtd-2.6.git;a=commit;h=ea56fb282368ea08c2a313af6b55cb597aec4db1
Commit:     ea56fb282368ea08c2a313af6b55cb597aec4db1
Parent:     7928b2cbe55b2a410a0f5c1f154610059c57b1b2
Author:     Stefan Agner <stefan at agner.ch>
AuthorDate: Fri Feb 9 13:21:42 2018 +0100
Committer:  Boris Brezillon <boris.brezillon at bootlin.com>
CommitDate: Mon Feb 12 10:56:36 2018 +0100

    mtd: nand: vf610: set correct ooblayout
    
    With commit 3cf32d180227 ("mtd: nand: vf610: switch to
    mtd_ooblayout_ops") the driver started to use the NAND cores
    default large page ooblayout. However, shortly after commit
    6a623e076944 ("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: 6a623e076944 ("mtd: nand: add ooblayout for old hamming layout")
    Cc: <stable at vger.kernel.org> # v4.12+
    Signed-off-by: Stefan Agner <stefan at agner.ch>
    Signed-off-by: Boris Brezillon <boris.brezillon at bootlin.com>
---
 drivers/mtd/nand/vf610_nfc.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/mtd/nand/vf610_nfc.c b/drivers/mtd/nand/vf610_nfc.c
index 80d31a58e558..f367144f3c6f 100644
--- a/drivers/mtd/nand/vf610_nfc.c
+++ b/drivers/mtd/nand/vf610_nfc.c
@@ -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;