X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/60289aade7304b10112a6839dcf293e719f057eb..807dad190f2e9a4fd7651808e33d2d8992c7d700:/target/linux/generic-2.6/patches-2.6.25/070-redboot_space.patch?ds=sidebyside

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 434b9ab09..784fba1b7 100644
--- 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
@@ -1,7 +1,5 @@
-Index: linux-2.6.25.1/drivers/mtd/redboot.c
-===================================================================
---- linux-2.6.25.1.orig/drivers/mtd/redboot.c
-+++ linux-2.6.25.1/drivers/mtd/redboot.c
+--- a/drivers/mtd/redboot.c
++++ b/drivers/mtd/redboot.c
 @@ -251,14 +251,21 @@ static int parse_redboot_partitions(stru
  #endif
  		names += strlen(names)+1;
@@ -17,15 +15,15 @@ Index: linux-2.6.25.1/drivers/mtd/redboot.c
 +				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;