From 8fee1aaa7b739ba1ff6f29ed694706909956d826 Mon Sep 17 00:00:00 2001
From: Bastian Hecht <hechtb@googlemail.com>
Date: Thu, 5 Jul 2012 12:41:02 +0200
Subject: [PATCH] --- yaml --- r: 332674 b: refs/heads/master c:
 894824f9731a805b70b553220ae58e5475ff6ff1 h: refs/heads/master v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/mtd/nand/sh_flctl.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 2bcf64ea74b1..194518dfc838 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d76236f30f1280f9345bb266a161e3ba60518c83
+refs/heads/master: 894824f9731a805b70b553220ae58e5475ff6ff1
diff --git a/trunk/drivers/mtd/nand/sh_flctl.c b/trunk/drivers/mtd/nand/sh_flctl.c
index 1343315b37ba..4ff8ef526c02 100644
--- a/trunk/drivers/mtd/nand/sh_flctl.c
+++ b/trunk/drivers/mtd/nand/sh_flctl.c
@@ -396,7 +396,8 @@ static int flctl_read_page_hwecc(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;
 }