Fixes for 6.5

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-6.5/asoc-cs35l56-call-pm_runtime_dont_use_autosuspend.patch b/queue-6.5/asoc-cs35l56-call-pm_runtime_dont_use_autosuspend.patch
new file mode 100644 (file)
index 0000000..4559c9f
--- /dev/null
+++ b/queue-6.5/asoc-cs35l56-call-pm_runtime_dont_use_autosuspend.patch
@@ -0,0 +1,44 @@
+From 1d9a464003bafe41509f2b539ae0bcb93215f99f Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sashal@kernel.org>
+Date: Mon, 2 Oct 2023 13:50:59 +0100
+Subject: ASoC: cs35l56: Call pm_runtime_dont_use_autosuspend()
+
+From: Richard Fitzgerald <rf@opensource.cirrus.com>
+
+commit ec03804552e9a723569e14d2512f36a8e70dc640 upstream
+
+Driver remove() must call pm_runtime_dont_use_autosuspend().
+
+Drivers that call pm_runtime_use_autosuspend() must disable
+it in driver remove(). Unfortunately until recently this was
+only mentioned in 1 line in a 900+ line document so most
+people hadn't noticed this. It has only recently been added
+to the kerneldoc of pm_runtime_use_autosuspend().
+
+Backport note: This is the same change as the upstream
+commit but the cs35l56->base.dev argument in the upstream
+code is cs35l56->dev in older releases.
+
+Signed-off-by: Richard Fitzgerald <rf@opensource.cirrus.com>
+Link: https://lore.kernel.org/r/20230908101716.2658582-1-rf@opensource.cirrus.com
+Signed-off-by: Mark Brown <broonie@kernel.org>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ sound/soc/codecs/cs35l56.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/sound/soc/codecs/cs35l56.c b/sound/soc/codecs/cs35l56.c
+index fd06b9f9d496d..7e241908b5f16 100644
+--- a/sound/soc/codecs/cs35l56.c
++++ b/sound/soc/codecs/cs35l56.c
+@@ -1594,6 +1594,7 @@ void cs35l56_remove(struct cs35l56_private *cs35l56)
+       flush_workqueue(cs35l56->dsp_wq);
+       destroy_workqueue(cs35l56->dsp_wq);
+ 
++      pm_runtime_dont_use_autosuspend(cs35l56->dev);
+       pm_runtime_suspend(cs35l56->dev);
+       pm_runtime_disable(cs35l56->dev);
+ 
+-- 
+2.40.1
+

diff --git a/queue-6.5/series b/queue-6.5/series
index 17fa02ed2cdc5a5b0de3a7e1f80ab8c370470417..3bb05fd9fde9d5d3bd03c8c2fee67f41ba07c0f9 100644 (file)
--- a/queue-6.5/series
+++ b/queue-6.5/series
@@ -235,3 +235,4 @@ loongarch-use-_ul-and-_ull.patch
 loongarch-set-all-reserved-memblocks-on-node-0-at-in.patch
 fbdev-sh7760fb-depend-on-fb-y.patch
 perf-build-define-yynomem-as-yynoabort-for-bison-3.8.patch
+asoc-cs35l56-call-pm_runtime_dont_use_autosuspend.patch