From d45d4747b736a363f1f5d25d15d35d35b58767ab Mon Sep 17 00:00:00 2001
From: Roman Tereshonkov <roman.tereshonkov@nokia.com>
Date: Fri, 2 Dec 2011 15:07:17 +0200
Subject: [PATCH] --- yaml --- r: 282834 b: refs/heads/master c:
 3538c56329936c78f7d356889908790006d0124c h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 250e5b1fc763..86f922eb9c90 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2f4478ccff7df845dc9c0f8996a96373122c4417
+refs/heads/master: 3538c56329936c78f7d356889908790006d0124c
diff --git a/trunk/drivers/mtd/mtdoops.c b/trunk/drivers/mtd/mtdoops.c
index 1e2fa6236705..cea9279ceabf 100644
--- a/trunk/drivers/mtd/mtdoops.c
+++ b/trunk/drivers/mtd/mtdoops.c
@@ -253,6 +253,9 @@ static void find_next_position(struct mtdoops_context *cxt)
 	size_t retlen;
 
 	for (page = 0; page < cxt->oops_pages; page++) {
+		if (mtd->block_isbad &&
+		    mtd->block_isbad(mtd, page * record_size))
+			continue;
 		/* Assume the page is used */
 		mark_page_used(cxt, page);
 		ret = mtd->read(mtd, page * record_size, MTDOOPS_HEADER_SIZE,