From b122d5f450cdc144d8229ee92068554bcc63b97e Mon Sep 17 00:00:00 2001
From: Mike Dunn <mikedunn@newsguy.com>
Date: Tue, 11 Sep 2012 08:50:50 -0700
Subject: [PATCH] --- yaml --- r: 332762 b: refs/heads/master c:
 5bf3d66a933efb71fa6db08a5043a617b6eadb4a h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 4fb2c896baad..ad8af60db1a7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 61de9da657e8c52606d45ae67dfa187111bf9b55
+refs/heads/master: 5bf3d66a933efb71fa6db08a5043a617b6eadb4a
diff --git a/trunk/drivers/mtd/nand/docg4.c b/trunk/drivers/mtd/nand/docg4.c
index 793921e56f8e..799da5d1c857 100644
--- a/trunk/drivers/mtd/nand/docg4.c
+++ b/trunk/drivers/mtd/nand/docg4.c
@@ -776,6 +776,8 @@ static int read_page(struct mtd_info *mtd, struct nand_chip *nand,
 	}
 
 	writew(0, docptr + DOC_DATAEND);
+	if (bits_corrected == -EBADMSG)	  /* uncorrectable errors */
+		return 0;
 	return bits_corrected;
 }