aboutsummaryrefslogtreecommitdiff
path: root/target/linux/generic/hack-6.1
diff options
context:
space:
mode:
authorRafał Miłecki <rafal@milecki.pl>2023-10-31 17:09:45 +0100
committerRafał Miłecki <rafal@milecki.pl>2023-10-31 17:33:28 +0100
commitc997634c017294cb38cf6f9a0112860c7e736a53 (patch)
treee22761d7043f7979982269e19042051ddd3bc1c8 /target/linux/generic/hack-6.1
parentc441f9b2c591189187128e8beb4b20bea6dccd06 (diff)
kernel: fix mtd/NVMEM regression affecting U-Boot env NVMEM driver
Fixes: b5956700702b ("kernel: backport nvmem v6.6 fixes and v6.7 changes") Fixes: https://github.com/openwrt/openwrt/issues/13831 Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
Diffstat (limited to 'target/linux/generic/hack-6.1')
-rw-r--r--target/linux/generic/hack-6.1/402-mtd-blktrans-call-add-disks-after-mtd-device.patch2
-rw-r--r--target/linux/generic/hack-6.1/420-mtd-support-OpenWrt-s-MTD_ROOTFS_ROOT_DEV.patch2
2 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/hack-6.1/402-mtd-blktrans-call-add-disks-after-mtd-device.patch b/target/linux/generic/hack-6.1/402-mtd-blktrans-call-add-disks-after-mtd-device.patch
index 295da11eb4..c82ca3edd8 100644
--- a/target/linux/generic/hack-6.1/402-mtd-blktrans-call-add-disks-after-mtd-device.patch
+++ b/target/linux/generic/hack-6.1/402-mtd-blktrans-call-add-disks-after-mtd-device.patch
@@ -91,7 +91,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
#include "mtdcore.h"
-@@ -1075,6 +1076,8 @@ int mtd_device_parse_register(struct mtd
+@@ -1098,6 +1099,8 @@ int mtd_device_parse_register(struct mtd
register_reboot_notifier(&mtd->reboot_notifier);
}
diff --git a/target/linux/generic/hack-6.1/420-mtd-support-OpenWrt-s-MTD_ROOTFS_ROOT_DEV.patch b/target/linux/generic/hack-6.1/420-mtd-support-OpenWrt-s-MTD_ROOTFS_ROOT_DEV.patch
index 8e8e5cea8d..7c7e4c814e 100644
--- a/target/linux/generic/hack-6.1/420-mtd-support-OpenWrt-s-MTD_ROOTFS_ROOT_DEV.patch
+++ b/target/linux/generic/hack-6.1/420-mtd-support-OpenWrt-s-MTD_ROOTFS_ROOT_DEV.patch
@@ -12,7 +12,7 @@ Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
--- a/drivers/mtd/mtdcore.c
+++ b/drivers/mtd/mtdcore.c
-@@ -750,7 +750,8 @@ int add_mtd_device(struct mtd_info *mtd)
+@@ -773,7 +773,8 @@ int add_mtd_device(struct mtd_info *mtd)
mutex_unlock(&mtd_table_mutex);