From 8d18b1cee4f5a4c27f8e74f1966169283920ea78 Mon Sep 17 00:00:00 2001
From: Brian Norris <computersforpeace@gmail.com>
Date: Fri, 13 Jan 2012 18:11:49 -0800
Subject: [PATCH] --- yaml --- r: 298081 b: refs/heads/master c:
 85443319989bb91814504608a6e11d880e156828 h: refs/heads/master i:   298079:
 3c6eebb65630ed8af593512c8f982d1531b4b1bb v: v3

---
 [refs]                             |  2 +-
 trunk/drivers/mtd/nand/nand_base.c | 12 ++++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index fb1d9de29832..836ce747b87e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cdbec0508699e3346052bf098c5c330a711a86a9
+refs/heads/master: 85443319989bb91814504608a6e11d880e156828
diff --git a/trunk/drivers/mtd/nand/nand_base.c b/trunk/drivers/mtd/nand/nand_base.c
index 7855fd2d5c60..c6603d4b25c8 100644
--- a/trunk/drivers/mtd/nand/nand_base.c
+++ b/trunk/drivers/mtd/nand/nand_base.c
@@ -430,13 +430,17 @@ static int nand_default_block_markbad(struct mtd_info *mtd, loff_t ofs)
 		/*
 		 * Write to first two pages if necessary. If we write to more
 		 * than one location, the first error encountered quits the
-		 * procedure. We write two bytes per location, so we dont have
-		 * to mess with 16 bit access.
+		 * procedure.
 		 */
-		ops.len = ops.ooblen = 2;
 		ops.datbuf = NULL;
 		ops.oobbuf = buf;
-		ops.ooboffs = chip->badblockpos & ~0x01;
+		ops.ooboffs = chip->badblockpos;
+		if (chip->options & NAND_BUSWIDTH_16) {
+			ops.ooboffs &= ~0x01;
+			ops.len = ops.ooblen = 2;
+		} else {
+			ops.len = ops.ooblen = 1;
+		}
 		ops.mode = MTD_OPS_PLACE_OOB;
 		do {
 			ret = nand_do_write_oob(mtd, ofs, &ops);