| Message ID | 20230705123018.30903-3-johan+linaro@kernel.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 46ec420573cefa1fc98025e7e6841bdafd6f1e20 |
| Headers | show |
| Series | ASoC/soundwire/qdsp6/wcd: fix leaks and probe deferral | expand |
On 05/07/2023 13:30, Johan Hovold wrote: > 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@vger.kernel.org # 5.17 > Cc: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> > Signed-off-by: Johan Hovold <johan+linaro@kernel.org> > --- Reviewed-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> > sound/soc/qcom/qdsp6/topology.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/sound/soc/qcom/qdsp6/topology.c b/sound/soc/qcom/qdsp6/topology.c > index cccc59b570b9..130b22a34fb3 100644 > --- 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_component *component) > > 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);
diff --git a/sound/soc/qcom/qdsp6/topology.c b/sound/soc/qcom/qdsp6/topology.c index cccc59b570b9..130b22a34fb3 100644 --- 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_component *component) 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);
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@vger.kernel.org # 5.17 Cc: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> Signed-off-by: Johan Hovold <johan+linaro@kernel.org> --- sound/soc/qcom/qdsp6/topology.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)