diff mbox

[U-Boot,v2,3/3] atmel_nand: use the definition: PMECC_OOB_RESERVED_BYTES instead magic number

Message ID 1453701995-23926-4-git-send-email-wenyou.yang@atmel.com
State Awaiting Upstream
Delegated to: Andreas Bießmann
Headers show

Commit Message

Wenyou Yang Jan. 25, 2016, 6:06 a.m. UTC 
From: Josh Wu <josh.wu@atmel.com>

As atmel_nand_ecc.h is sync with v4.1 kernel, which adds the
PMECC_OOB_RESERVED_BYTES. So use it in the driver.

Signed-off-by: Josh Wu <josh.wu@atmel.com>
Reviewed-by: Andreas Bießmann <andreas.devel@googlemail.com>
Signed-off-by: Wenyou Yang <wenyou.yang@atmel.com>
---

Changes in v2:
 - following Andreas' advice, change the message for more concise.
 - collect the Reviewed-by from Andreas.
 - drop a patch:
	[PATCH 3/4] atmel_nand: increase more delay to support MT29F32G08CBADA

 drivers/mtd/nand/atmel_nand.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Andreas Bießmann Jan. 27, 2016, 1 p.m. UTC | #1 
Dear Wenyou Yang,

Wenyou Yang <wenyou.yang@atmel.com> writes:
>From: Josh Wu <josh.wu@atmel.com>
>
>As atmel_nand_ecc.h is sync with v4.1 kernel, which adds the
>PMECC_OOB_RESERVED_BYTES. So use it in the driver.
>
>Signed-off-by: Josh Wu <josh.wu@atmel.com>
>Reviewed-by: Andreas Bießmann <andreas.devel@googlemail.com>
>Signed-off-by: Wenyou Yang <wenyou.yang@atmel.com>
>---
>
>Changes in v2:
> - following Andreas' advice, change the message for more concise.
> - collect the Reviewed-by from Andreas.
> - drop a patch:
>	[PATCH 3/4] atmel_nand: increase more delay to support MT29F32G08CBADA
>
> drivers/mtd/nand/atmel_nand.c |    2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)

applied to u-boot-atmel/master, thanks!

Best regards,
Andreas Bießmann
diff mbox

Patch

diff --git a/drivers/mtd/nand/atmel_nand.c b/drivers/mtd/nand/atmel_nand.c
index 852883b..73fd403 100644
--- a/drivers/mtd/nand/atmel_nand.c
+++ b/drivers/mtd/nand/atmel_nand.c
@@ -901,7 +901,7 @@  static int atmel_pmecc_nand_init_params(struct nand_chip *nand,
 			return -EINVAL;
 		}
 
-		if (nand->ecc.bytes > mtd->oobsize - 2) {
+		if (nand->ecc.bytes > mtd->oobsize - PMECC_OOB_RESERVED_BYTES) {
 			dev_err(host->dev, "No room for ECC bytes\n");
 			return -EINVAL;
 		}