kernel: bump 5.15 to 5.15.62

[openwrt/staging/nbd.git] / target / linux / generic / pending-5.15 / 420-mtd-redboot_space.patch

diff --git a/target/linux/generic/pending-5.15/420-mtd-redboot_space.patch b/target/linux/generic/pending-5.15/420-mtd-redboot_space.patch
index a3cd4ecf1f9bf799ad57f6d7892838df81bcaae4..5518ea71dd51f9d9c908e750cccd816ce8778027 100644 (file)
--- a/target/linux/generic/pending-5.15/420-mtd-redboot_space.patch
+++ b/target/linux/generic/pending-5.15/420-mtd-redboot_space.patch
@@ -11,14 +11,14 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
 
 --- a/drivers/mtd/parsers/redboot.c
 +++ b/drivers/mtd/parsers/redboot.c
-@@ -279,14 +279,21 @@ static int parse_redboot_partitions(stru
+@@ -278,14 +278,21 @@ nogood:
  #endif
-               names += strlen(names)+1;
+               names += strlen(names) + 1;
  
 -#ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED
-               if(fl->next && fl->img->flash_base + fl->img->size + master->erasesize <= fl->next->img->flash_base) {
+               if (fl->next && fl->img->flash_base + fl->img->size + master->erasesize <= fl->next->img->flash_base) {
 -                      i++;
--                      parts[i].offset = parts[i-1].size + parts[i-1].offset;
+-                      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;
 -              }