kernel: bump 5.15 to 5.15.98

[openwrt/openwrt.git] / target / linux / generic / hack-5.15 / 402-mtd-blktrans-call-add-disks-after-mtd-device.patch

diff --git a/target/linux/generic/hack-5.15/402-mtd-blktrans-call-add-disks-after-mtd-device.patch b/target/linux/generic/hack-5.15/402-mtd-blktrans-call-add-disks-after-mtd-device.patch
index a715d17f3b8e9f07f17760b3d47bf417e1b8a16c..b10b8d997963103b7f98ab4d7085c00b6e5e1c69 100644 (file)
--- a/target/linux/generic/hack-5.15/402-mtd-blktrans-call-add-disks-after-mtd-device.patch
+++ b/target/linux/generic/hack-5.15/402-mtd-blktrans-call-add-disks-after-mtd-device.patch
@@ -25,7 +25,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
 
 --- a/drivers/mtd/mtd_blkdevs.c
 +++ b/drivers/mtd/mtd_blkdevs.c
-@@ -457,13 +457,6 @@ int add_mtd_blktrans_dev(struct mtd_blkt
+@@ -384,13 +384,6 @@ int add_mtd_blktrans_dev(struct mtd_blkt
        if (new->readonly)
                set_disk_ro(gd, 1);
  
@@ -37,9 +37,9 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
 -              WARN_ON(ret);
 -      }
        return 0;
- error4:
-       kfree(new->tag_set);
-@@ -475,6 +468,27 @@ error1:
+ 
+ out_free_tag_set:
+@@ -402,6 +395,27 @@ out_list_del:
        return ret;
  }
  
@@ -69,7 +69,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
        unsigned long flags;
 --- a/drivers/mtd/mtdcore.c
 +++ b/drivers/mtd/mtdcore.c
-@@ -31,6 +31,7 @@
+@@ -32,6 +32,7 @@
  
  #include <linux/mtd/mtd.h>
  #include <linux/mtd/partitions.h>
@@ -77,9 +77,9 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
  
  #include "mtdcore.h"
  
-@@ -851,6 +852,8 @@ int mtd_device_parse_register(struct mtd
-               register_reboot_notifier(&mtd->reboot_notifier);
-       }
+@@ -1081,6 +1082,8 @@ int mtd_device_parse_register(struct mtd
+ 
+       ret = mtd_otp_nvmem_add(mtd);
  
 +      register_mtd_blktrans_devs();
 +