diff options
| author | Rafał Miłecki <rafal@milecki.pl> | 2023-04-06 07:26:11 +0200 |
|---|---|---|
| committer | Rafał Miłecki <rafal@milecki.pl> | 2023-04-06 07:26:11 +0200 |
| commit | b67ba02fc848cee5175cfdefe81e10adf195c435 (patch) | |
| tree | fbf54ac07fc06398044872f571e8b3eb11209da5 /target/linux/generic/hack-5.15 | |
| parent | 3b212db232a7c82935c474f081dd72092ea761d9 (diff) | |
| download | upstream-b67ba02fc848cee5175cfdefe81e10adf195c435.tar.gz upstream-b67ba02fc848cee5175cfdefe81e10adf195c435.tar.bz2 upstream-b67ba02fc848cee5175cfdefe81e10adf195c435.zip | |
kernel: backport mtd fixes for nvmem
They are needed for NVMEM changes pending for v6.4.
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
Diffstat (limited to 'target/linux/generic/hack-5.15')
| -rw-r--r-- | target/linux/generic/hack-5.15/402-mtd-blktrans-call-add-disks-after-mtd-device.patch | 10 |
1 files changed, 5 insertions, 5 deletions
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 <daniel@makrotopia.org> #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 |