diff --git a/[refs] b/[refs]
index 7b2610b9ef87..bf1c76a8ced1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: edcb3b14863e1a6aa1923eeaa81125a00cf51a80
+refs/heads/master: 4149ed1aa944ab864024982a2e568d17eccff504
diff --git a/trunk/drivers/mtd/nftlcore.c b/trunk/drivers/mtd/nftlcore.c
index fb86cacd5bdb..665d3eba2f47 100644
--- a/trunk/drivers/mtd/nftlcore.c
+++ b/trunk/drivers/mtd/nftlcore.c
@@ -181,7 +181,7 @@ static int nftl_write(struct mtd_info *mtd, loff_t offs, size_t len,
 	int res;
 
 	ops.mode = MTD_OOB_PLACE;
-	ops.ooboffs = offs;
+	ops.ooboffs = offs & (mtd->writesize - 1);
 	ops.ooblen = mtd->oobsize;
 	ops.oobbuf = oob;
 	ops.datbuf = buf;