From a0997d6bfefb3b016a2a7901e034e2c3a0d275a0 Mon Sep 17 00:00:00 2001
From: David Woodhouse <dwmw2@infradead.org>
Date: Sun, 28 Oct 2007 21:57:02 -0400
Subject: [PATCH] --- yaml --- r: 84188 b: refs/heads/master c:
 3c441baa0365ea7c3be9ee79f03e944289dd37e1 h: refs/heads/master v: v3

---
 [refs]                      |  2 +-
 trunk/drivers/mtd/redboot.c | 25 ++++++++++++++++++++-----
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 1205ee0c83aa..615e47bca6c1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9c37f3329ae098d4c17e8bec589a589bcbf0acff
+refs/heads/master: 3c441baa0365ea7c3be9ee79f03e944289dd37e1
diff --git a/trunk/drivers/mtd/redboot.c b/trunk/drivers/mtd/redboot.c
index a61351f88ec0..47474903263c 100644
--- a/trunk/drivers/mtd/redboot.c
+++ b/trunk/drivers/mtd/redboot.c
@@ -59,16 +59,31 @@ static int parse_redboot_partitions(struct mtd_info *master,
 	static char nullstring[] = "unallocated";
 #endif
 
+	if ( directory < 0 ) {
+		offset = master->size + directory * master->erasesize;
+		while (master->block_isbad && 
+		       master->block_isbad(master, offset)) {
+			if (!offset) {
+			nogood:
+				printk(KERN_NOTICE "Failed to find a non-bad block to check for RedBoot partition table\n");
+				return -EIO;
+			}
+			offset -= master->erasesize;
+		}
+	} else {
+		offset = directory * master->erasesize;
+		while (master->block_isbad && 
+		       master->block_isbad(master, offset)) {
+			offset += master->erasesize;
+			if (offset == master->size)
+				goto nogood;
+		}
+	}
 	buf = vmalloc(master->erasesize);
 
 	if (!buf)
 		return -ENOMEM;
 
-	if ( directory < 0 )
-		offset = master->size + directory*master->erasesize;
-	else
-		offset = directory*master->erasesize;
-
 	printk(KERN_NOTICE "Searching for RedBoot partition table in %s at offset 0x%lx\n",
 	       master->name, offset);