From da646c21d9b82996d6f1897aa2945bfd53e6c0fb Mon Sep 17 00:00:00 2001 From: Brian Norris Date: Wed, 2 May 2012 10:15:01 -0700 Subject: [PATCH] --- yaml --- r: 310221 b: refs/heads/master c: a6976cdfe69756436ed8c22b7a03e47a7efe36fb h: refs/heads/master i: 310219: 4c5de6ca98e86e5b8632207c8dec21858eae587b v: v3 --- [refs] | 2 +- trunk/drivers/mtd/nand/fsl_ifc_nand.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index d4f2b75c303c..63b91dc9eb5a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d112dc7fa65882279434622a40cbe7677a780c46 +refs/heads/master: a6976cdfe69756436ed8c22b7a03e47a7efe36fb diff --git a/trunk/drivers/mtd/nand/fsl_ifc_nand.c b/trunk/drivers/mtd/nand/fsl_ifc_nand.c index c085df3d816a..9602c1b7e27e 100644 --- a/trunk/drivers/mtd/nand/fsl_ifc_nand.c +++ b/trunk/drivers/mtd/nand/fsl_ifc_nand.c @@ -706,7 +706,8 @@ static int fsl_ifc_read_page(struct mtd_info *mtd, struct nand_chip *chip, struct fsl_ifc_nand_ctrl *nctrl = ifc_nand_ctrl; fsl_ifc_read_buf(mtd, buf, mtd->writesize); - fsl_ifc_read_buf(mtd, chip->oob_poi, mtd->oobsize); + if (oob_required) + fsl_ifc_read_buf(mtd, chip->oob_poi, mtd->oobsize); if (ctrl->nand_stat & IFC_NAND_EVTER_STAT_ECCER) dev_err(priv->dev, "NAND Flash ECC Uncorrectable Error\n");