Merge git://git.infradead.org/mtd-2.6

* git://git.infradead.org/mtd-2.6: (120 commits)
  [MTD] Fix mtdoops.c compilation
  [MTD] [NOR] fix startup lock when using multiple nor flash chips
  [MTD] [DOC200x] eccbuf is statically defined and always evaluate to true
  [MTD] Fix maps/physmap.c compilation with CONFIG_PM
  [MTD] onenand: Add panic_write function to the onenand driver
  [MTD] mtdoops: Use the panic_write function when present
  [MTD] Add mtd panic_write function pointer
  [MTD] [NAND] Freescale enhanced Local Bus Controller FCM NAND support.
  [MTD] physmap.c: Add support for multiple resources
  [MTD] [NAND] Fix misparenthesization introduced by commit 78b65179...
  [MTD] [NAND] Fix Blackfin NFC ECC calculating bug with page size 512 bytes
  [MTD] [NAND] Remove wrong operation in PM function of the BF54x NFC driver
  [MTD] [NAND] Remove unused variable in plat_nand_remove
  [MTD] Unlocking all Intel flash that is locked on power up.
  [MTD] [NAND] at91_nand: Make mtdparts option can override board info
  [MTD] mtdoops: Various minor cleanups
  [MTD] mtdoops: Ensure sequential write to the buffer
  [MTD] mtdoops: Perform write operations in a workqueue
  [MTD] mtdoops: Add further error return code checking
  [MTD] [NOR] Test devtype, not definition in flash_probe(), drivers/mtd/devices/lart.c
  ...

1 files changed, 20 insertions, 5 deletions

diff --git a/drivers/mtd/redboot.c b/drivers/mtd/redboot.c
index a61351f88ec0..47474903263c 100644
--- a/drivers/mtd/redboot.c
+++ b/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);