From 3df30271fc23b57831bad833275efcbf4452f302 Mon Sep 17 00:00:00 2001 From: Brian Norris Date: Wed, 2 May 2012 10:15:03 -0700 Subject: [PATCH] --- yaml --- r: 310223 b: refs/heads/master c: 279f08d4ef6548be4e2fa638245adebc77436e54 h: refs/heads/master i: 310221: da646c21d9b82996d6f1897aa2945bfd53e6c0fb 310219: 4c5de6ca98e86e5b8632207c8dec21858eae587b 310215: 3c4ef05d77381f9351be7e5dd12537909012163c 310207: d3a69599a0207d930692cf5a0d33a6b6e7803527 v: v3 --- [refs] | 2 +- trunk/drivers/mtd/nand/nand_base.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 8a3603780aba..5568741bd1d0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7725cc85932bd02dd12c23108e0ef748c551ccba +refs/heads/master: 279f08d4ef6548be4e2fa638245adebc77436e54 diff --git a/trunk/drivers/mtd/nand/nand_base.c b/trunk/drivers/mtd/nand/nand_base.c index 464b742431ed..14e9b32ed8c7 100644 --- a/trunk/drivers/mtd/nand/nand_base.c +++ b/trunk/drivers/mtd/nand/nand_base.c @@ -1075,7 +1075,8 @@ static int nand_read_page_raw(struct mtd_info *mtd, struct nand_chip *chip, uint8_t *buf, int oob_required, int page) { chip->read_buf(mtd, buf, mtd->writesize); - chip->read_buf(mtd, chip->oob_poi, mtd->oobsize); + if (oob_required) + chip->read_buf(mtd, chip->oob_poi, mtd->oobsize); return 0; } @@ -1928,7 +1929,8 @@ static void nand_write_page_raw(struct mtd_info *mtd, struct nand_chip *chip, const uint8_t *buf, int oob_required) { chip->write_buf(mtd, buf, mtd->writesize); - chip->write_buf(mtd, chip->oob_poi, mtd->oobsize); + if (oob_required) + chip->write_buf(mtd, chip->oob_poi, mtd->oobsize); } /**