From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Tue, 21 Jan 2025 13:27:14 +0000 (+0100)
Subject: 5.15-stable patches
X-Git-Tag: v5.15.177~24
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4f0ca501b57d11dfdefc9aaa6d6a8c83dd939eda;p=thirdparty%2Fkernel%2Fstable-queue.git

5.15-stable patches

added patches:
	revert-regmap-detach-regmap-from-dev-on-regmap_exit.patch
---

diff --git a/queue-5.15/revert-regmap-detach-regmap-from-dev-on-regmap_exit.patch b/queue-5.15/revert-regmap-detach-regmap-from-dev-on-regmap_exit.patch
new file mode 100644
index 0000000000..e6481a50d7
--- /dev/null
+++ b/queue-5.15/revert-regmap-detach-regmap-from-dev-on-regmap_exit.patch
@@ -0,0 +1,49 @@
+From 393f6dec4efd0bb0af41a1f3633e19695b847fe7 Mon Sep 17 00:00:00 2001
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Date: Tue, 21 Jan 2025 14:26:25 +0100
+Subject: Revert "regmap: detach regmap from dev on regmap_exit"
+
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+This reverts commit f373a189817584d0af5f922e91cad40e45f12314 which is
+commit 3061e170381af96d1e66799d34264e6414d428a7 upstream.
+
+It was backported incorrectly, a fixed version will be applied later.
+
+Cc: Cosmin Tanislav <demonsingur@gmail.com>
+Cc: Mark Brown <broonie@kernel.org>
+Link: https://lore.kernel.org/r/20250115033244.2540522-1-tzungbi@kernel.org
+Reported-by: Tzung-Bi Shih <tzungbi@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/base/regmap/regmap.c |   12 ------------
+ 1 file changed, 12 deletions(-)
+
+--- a/drivers/base/regmap/regmap.c
++++ b/drivers/base/regmap/regmap.c
+@@ -663,17 +663,6 @@ int regmap_attach_dev(struct device *dev
+ }
+ EXPORT_SYMBOL_GPL(regmap_attach_dev);
+ 
+-static int dev_get_regmap_match(struct device *dev, void *res, void *data);
+-
+-static int regmap_detach_dev(struct device *dev, struct regmap *map)
+-{
+-	if (!dev)
+-		return 0;
+-
+-	return devres_release(dev, dev_get_regmap_release,
+-			      dev_get_regmap_match, (void *)map->name);
+-}
+-
+ static enum regmap_endian regmap_get_reg_endian(const struct regmap_bus *bus,
+ 					const struct regmap_config *config)
+ {
+@@ -1508,7 +1497,6 @@ int regmap_reinit_cache(struct regmap *m
+ {
+ 	int ret;
+ 
+-	regmap_detach_dev(map->dev, map);
+ 	regcache_exit(map);
+ 	regmap_debugfs_exit(map);
+ 
diff --git a/queue-5.15/series b/queue-5.15/series
index 8e43920af2..738e909087 100644
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -117,3 +117,4 @@ iio-imu-inv_icm42600-fix-spi-burst-write-not-supported.patch
 iio-imu-inv_icm42600-fix-timestamps-after-suspend-if-sensor-is-on.patch
 iio-adc-rockchip_saradc-fix-information-leak-in-triggered-buffer.patch
 revert-drm-amdgpu-rework-resume-handling-for-display-v2.patch
+revert-regmap-detach-regmap-from-dev-on-regmap_exit.patch