---

yaml --- r: 282834 b: refs/heads/master c: 3538c56 h: refs/heads/master v: v3
git-mirror · Jan 9, 2012 · d45d474 · d45d474
1 parent 6be1468
commit d45d474
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git 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
@@ -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,