Unverified Commit 688abe28 authored by Wentao Liang's avatar Wentao Liang Committed by Mark Brown
Browse files

ASoC: qcom: sdm845: Add error handling in sdm845_slim_snd_hw_params() 



The function sdm845_slim_snd_hw_params() calls the functuion
snd_soc_dai_set_channel_map() but does not check its return
value. A proper implementation can be found in msm_snd_hw_params().

Add error handling for snd_soc_dai_set_channel_map(). If the
function fails and it is not a unsupported error, return the
error code immediately.

Fixes: 5caf64c6 ("ASoC: qcom: sdm845: add support to DB845c and Lenovo Yoga")
Cc: stable@vger.kernel.org # v5.6
Signed-off-by: default avatarWentao Liang <vulab@iscas.ac.cn>
Reviewed-by: default avatarDmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
Link: https://patch.msgid.link/20250519075739.1458-1-vulab@iscas.ac.cn


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent e717c661

sound/soc/qcom/sdm845.c

+4 −0
Original line number Diff line number Diff line
@@ -91,6 +91,10 @@ static int sdm845_slim_snd_hw_params(struct snd_pcm_substream *substream, 
		else

			ret = snd_soc_dai_set_channel_map(cpu_dai, tx_ch_cnt,

							  tx_ch, 0, NULL);

		if (ret != 0 && ret != -ENOTSUPP) {

			dev_err(rtd->dev, "failed to set cpu chan map, err:%d\n", ret);

			return ret;

		}

	}



	return 0;