From 04b7876bb3ccd62e0a3d903f87b5b8818d3d1360 Mon Sep 17 00:00:00 2001
From: Vipin Kumar <vipin.kumar@st.com>
Date: Wed, 14 Mar 2012 11:47:10 +0530
Subject: [PATCH] --- yaml --- r: 298171 b: refs/heads/master c:
 aea686b47c0cf97e0c6941799b523b6df87fc234 h: refs/heads/master i:   298169:
 412017d3cb7f5faf40776d5f0944e9dc3bfc6787   298167:
 51cf84d52297b25e087d3dc685fcac20eeb77f08 v: v3

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

diff --git a/[refs] b/[refs]
index bcaf7d56662c..6ec64413920d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4cbe1bf07a4dfc3ec2d81c4e8aee832384997bc4
+refs/heads/master: aea686b47c0cf97e0c6941799b523b6df87fc234
diff --git a/trunk/drivers/mtd/nand/fsmc_nand.c b/trunk/drivers/mtd/nand/fsmc_nand.c
index 902ba0d9c32d..bd423390d330 100644
--- a/trunk/drivers/mtd/nand/fsmc_nand.c
+++ b/trunk/drivers/mtd/nand/fsmc_nand.c
@@ -549,7 +549,9 @@ static int fsmc_read_page_hwecc(struct mtd_info *mtd, struct nand_chip *chip,
 			 * to read at least 13 bytes even in case of 16 bit NAND
 			 * devices
 			 */
-			len = roundup(len, 2);
+			if (chip->options & NAND_BUSWIDTH_16)
+				len = roundup(len, 2);
+
 			chip->cmdfunc(mtd, NAND_CMD_READOOB, off, page);
 			chip->read_buf(mtd, oob + j, len);
 			j += len;