This is a note to let you know that I've just added the patch titled
ASoC: codecs: wcd938x: fix runtime PM imbalance on remove
to the 6.5-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
asoc-codecs-wcd938x-fix-runtime-pm-imbalance-on-remove.patch
and it can be found in the queue-6.5 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 3ebebb2c1eca92a15107b2d7aeff34196fd9e217 Mon Sep 17 00:00:00 2001
From: Johan Hovold <johan+linaro@xxxxxxxxxx>
Date: Tue, 3 Oct 2023 17:55:56 +0200
Subject: ASoC: codecs: wcd938x: fix runtime PM imbalance on remove
From: Johan Hovold <johan+linaro@xxxxxxxxxx>
commit 3ebebb2c1eca92a15107b2d7aeff34196fd9e217 upstream.
Make sure to balance the runtime PM operations, including the disable
count, on driver unbind.
Fixes: 16572522aece ("ASoC: codecs: wcd938x-sdw: add SoundWire driver")
Cc: stable@xxxxxxxxxxxxxxx # 5.14
Cc: Srinivas Kandagatla <srinivas.kandagatla@xxxxxxxxxx>
Signed-off-by: Johan Hovold <johan+linaro@xxxxxxxxxx>
Link: https://lore.kernel.org/r/20231003155558.27079-6-johan+linaro@xxxxxxxxxx
Signed-off-by: Mark Brown <broonie@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
sound/soc/codecs/wcd938x.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
--- a/sound/soc/codecs/wcd938x.c
+++ b/sound/soc/codecs/wcd938x.c
@@ -3620,9 +3620,15 @@ err_disable_regulators:
static void wcd938x_remove(struct platform_device *pdev)
{
- struct wcd938x_priv *wcd938x = dev_get_drvdata(&pdev->dev);
+ struct device *dev = &pdev->dev;
+ struct wcd938x_priv *wcd938x = dev_get_drvdata(dev);
+
+ component_master_del(dev, &wcd938x_comp_ops);
+
+ pm_runtime_disable(dev);
+ pm_runtime_set_suspended(dev);
+ pm_runtime_dont_use_autosuspend(dev);
- component_master_del(&pdev->dev, &wcd938x_comp_ops);
regulator_bulk_disable(WCD938X_MAX_SUPPLY, wcd938x->supplies);
regulator_bulk_free(WCD938X_MAX_SUPPLY, wcd938x->supplies);
}
Patches currently in stable-queue which might be from johan+linaro@xxxxxxxxxx are
queue-6.5/asoc-codecs-wcd938x-fix-runtime-pm-imbalance-on-remove.patch
queue-6.5/asoc-codecs-wcd938x-fix-unbind-tear-down-order.patch
queue-6.5/asoc-codecs-wcd938x-sdw-fix-use-after-free-on-driver-unbind.patch
queue-6.5/asoc-codecs-wcd938x-drop-bogus-bind-error-handling.patch
queue-6.5/asoc-codecs-wcd938x-fix-resource-leaks-on-bind-errors.patch
queue-6.5/asoc-codecs-wcd938x-fix-regulator-leaks-on-probe-errors.patch
queue-6.5/asoc-codecs-wcd938x-sdw-fix-runtime-pm-imbalance-on-probe-errors.patch
queue-6.5/regmap-fix-null-deref-on-lookup.patch
