kernel: bump 5.15 to 5.15.107

[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 988d900b3110446820684ff54450d8bec68da05f..32a7fb6266422f41d37551e038882ad79ad08050 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;
  }
  
@@ -51,7 +51,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
 +
 +      list_for_each_entry(tr, &blktrans_majors, list) {
 +              list_for_each_entry_safe(dev, next, &tr->devs, list) {
-+                      if (dev->disk->flags & GENHD_FL_UP)
++                      if (disk_live(dev->disk))
 +                              continue;
 +
 +                      device_add_disk(&dev->mtd->dev, dev->disk, NULL);
@@ -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,22 +77,22 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
  
  #include "mtdcore.h"
  
-@@ -851,6 +852,8 @@ int mtd_device_parse_register(struct mtd
+@@ -1082,6 +1083,8 @@ int mtd_device_parse_register(struct mtd
                register_reboot_notifier(&mtd->reboot_notifier);
        }
  
 +      register_mtd_blktrans_devs();
 +
  out:
-       if (ret && device_is_registered(&mtd->dev))
-               del_mtd_device(mtd);
+       if (ret) {
+               nvmem_unregister(mtd->otp_user_nvmem);
 --- a/include/linux/mtd/blktrans.h
 +++ b/include/linux/mtd/blktrans.h
-@@ -76,6 +76,6 @@ extern int deregister_mtd_blktrans(struc
+@@ -76,6 +76,7 @@ extern int deregister_mtd_blktrans(struc
  extern int add_mtd_blktrans_dev(struct mtd_blktrans_dev *dev);
  extern int del_mtd_blktrans_dev(struct mtd_blktrans_dev *dev);
  extern int mtd_blktrans_cease_background(struct mtd_blktrans_dev *dev);
--
 +extern void register_mtd_blktrans_devs(void);
  
- #endif /* __MTD_TRANS_H__ */
+ /**
+  * module_mtd_blktrans() - Helper macro for registering a mtd blktrans driver