From b67ba02fc848cee5175cfdefe81e10adf195c435 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= Date: Thu, 6 Apr 2023 07:26:11 +0200 Subject: kernel: backport mtd fixes for nvmem MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit They are needed for NVMEM changes pending for v6.4. Signed-off-by: Rafał Miłecki --- .../402-mtd-blktrans-call-add-disks-after-mtd-device.patch | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'target/linux/generic/hack-5.15') 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 b10b8d9979..32a7fb6266 100644 --- 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 @@ -77,15 +77,15 @@ Signed-off-by: Daniel Golle #include "mtdcore.h" -@@ -1081,6 +1082,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 -- cgit v1.2.3