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 eaba093376c96d2b060760dde49eac83f2dbc13d..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
@@ -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,15 +77,15 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
  
  #include "mtdcore.h"
  
-@@ -1075,6 +1076,8 @@ int mtd_device_parse_register(struct mtd
- 
-       ret = mtd_otp_nvmem_add(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,7 @@ extern int deregister_mtd_blktrans(struc