linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / drivers / mtd / redboot.c

diff --git a/drivers/mtd/redboot.c b/drivers/mtd/redboot.c
index 5b58523..8815c8d 100644 (file)
--- a/drivers/mtd/redboot.c
+++ b/drivers/mtd/redboot.c
@@ -1,5 +1,5 @@
 /*
- * $Id: redboot.c,v 1.21 2006/03/30 18:34:37 bjd Exp $
+ * $Id: redboot.c,v 1.19 2005/12/01 10:03:51 dwmw2 Exp $
  *
  * Parse RedBoot-style Flash Image System (FIS) tables and
  * produce a Linux partition array to match.
@@ -15,14 +15,14 @@
 
 struct fis_image_desc {
     unsigned char name[16];      // Null terminated name
-    uint32_t     flash_base;    // Address within FLASH of image
-    uint32_t     mem_base;      // Address in memory where it executes
-    uint32_t     size;          // Length of image
-    uint32_t     entry_point;   // Execution entry point
-    uint32_t     data_length;   // Length of actual data
-    unsigned char _pad[256-(16+7*sizeof(uint32_t))];
-    uint32_t     desc_cksum;    // Checksum over image descriptor
-    uint32_t     file_cksum;    // Checksum over image data
+    unsigned long flash_base;    // Address within FLASH of image
+    unsigned long mem_base;      // Address in memory where it executes
+    unsigned long size;          // Length of image
+    unsigned long entry_point;   // Execution entry point
+    unsigned long data_length;   // Length of actual data
+    unsigned char _pad[256-(16+7*sizeof(unsigned long))];
+    unsigned long desc_cksum;    // Checksum over image descriptor
+    unsigned long file_cksum;    // Checksum over image data
 };
 
 struct fis_list {
@@ -85,6 +85,10 @@ static int parse_redboot_partitions(struct mtd_info *master,
 
        numslots = (master->erasesize / sizeof(struct fis_image_desc));
        for (i = 0; i < numslots; i++) {
+               if (buf[i].name[0] == 0xff) {
+                       i = numslots;
+                       break;
+               }
                if (!memcmp(buf[i].name, "FIS directory", 14)) {
                        /* This is apparently the FIS directory entry for the
                         * FIS directory itself.  The FIS directory size is
@@ -124,7 +128,7 @@ static int parse_redboot_partitions(struct mtd_info *master,
                struct fis_list *new_fl, **prev;
 
                if (buf[i].name[0] == 0xff)
-                       continue;
+                       break;
                if (!redboot_checksum(&buf[i]))
                        break;