This is a note to let you know that I've just added the patch titled
ASoC: qdsp6: audioreach: fix topology probe deferral
to the 6.4-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-qdsp6-audioreach-fix-topology-probe-deferral.patch
and it can be found in the queue-6.4 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 46ec420573cefa1fc98025e7e6841bdafd6f1e20 Mon Sep 17 00:00:00 2001
From: Johan Hovold <johan+linaro@xxxxxxxxxx>
Date: Wed, 5 Jul 2023 14:30:12 +0200
Subject: ASoC: qdsp6: audioreach: fix topology probe deferral
From: Johan Hovold <johan+linaro@xxxxxxxxxx>
commit 46ec420573cefa1fc98025e7e6841bdafd6f1e20 upstream.
Propagate errors when failing to load the topology component so that
probe deferrals can be handled.
Fixes: 36ad9bf1d93d ("ASoC: qdsp6: audioreach: add topology support")
Cc: stable@xxxxxxxxxxxxxxx # 5.17
Cc: Srinivas Kandagatla <srinivas.kandagatla@xxxxxxxxxx>
Signed-off-by: Johan Hovold <johan+linaro@xxxxxxxxxx>
Reviewed-by: Srinivas Kandagatla <srinivas.kandagatla@xxxxxxxxxx>
Link: https://lore.kernel.org/r/20230705123018.30903-3-johan+linaro@xxxxxxxxxx
Signed-off-by: Mark Brown <broonie@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
sound/soc/qcom/qdsp6/topology.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- a/sound/soc/qcom/qdsp6/topology.c
+++ b/sound/soc/qcom/qdsp6/topology.c
@@ -1277,8 +1277,8 @@ int audioreach_tplg_init(struct snd_soc_
ret = snd_soc_tplg_component_load(component, &audioreach_tplg_ops, fw);
if (ret < 0) {
- dev_err(dev, "tplg component load failed%d\n", ret);
- ret = -EINVAL;
+ if (ret != -EPROBE_DEFER)
+ dev_err(dev, "tplg component load failed: %d\n", ret);
}
release_firmware(fw);
Patches currently in stable-queue which might be from johan+linaro@xxxxxxxxxx are
queue-6.4/asoc-codecs-wcd938x-fix-missing-mbhc-init-error-handling.patch
queue-6.4/asoc-codecs-wcd938x-fix-resource-leaks-on-component-remove.patch
queue-6.4/asoc-qdsp6-audioreach-fix-topology-probe-deferral.patch
queue-6.4/asoc-codecs-wcd938x-fix-missing-clsh-ctrl-error-handling.patch
queue-6.4/asoc-codecs-wcd938x-fix-soundwire-initialisation-race.patch
queue-6.4/asoc-codecs-wcd934x-fix-resource-leaks-on-component-remove.patch
queue-6.4/asoc-codecs-wcd938x-fix-codec-initialisation-race.patch
queue-6.4/asoc-codecs-wcd-mbhc-v2-fix-resource-leaks-on-component-remove.patch
