fix kernel oops in the redboot partition parser when CONFIG_MTD_REDBOOT_PARTS_UNALLOC...

[openwrt-10.03/.git] / target / linux / generic-2.6 / patches-2.6.25 / 070-redboot_space.patch

diff --git a/target/linux/generic-2.6/patches-2.6.25/070-redboot_space.patch b/target/linux/generic-2.6/patches-2.6.25/070-redboot_space.patch
index b473d59eca1a84a3930e184697a2cd7c0de3d18d..0f15bab3dd707b4675da1659252c756a21bef39c 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.25/070-redboot_space.patch
+++ b/target/linux/generic-2.6/patches-2.6.25/070-redboot_space.patch
@@ -15,15 +15,15 @@
 +                              parts[i].size = fl->next->img->flash_base;
 +                              parts[i].size &= ~(master->erasesize - 1);
 +                              parts[i].size -= parts[i].offset;
-+                      }
 +#ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED
-+                      else {
++                              nrparts--;
++                      } else {
 +                              i++;
 +                              parts[i].offset = parts[i-1].size + parts[i-1].offset;
 +                              parts[i].size = fl->next->img->flash_base - parts[i].offset;
 +                              parts[i].name = nullname;
-+                      }
  #endif
++                      }
 +              }
                tmp_fl = fl;
                fl = fl->next;