Commit ed41d104 authored Mar 07, 2022 by Codrin Ciubotariu Committed by Greg Kroah-Hartman Apr 15, 2022

ASoC: dmaengine: do not use a NULL prepare_slave_config() callback



[ Upstream commit 9a1e13440a4f2e7566fd4c5eae6a53e6400e08a4 ]

Even if struct snd_dmaengine_pcm_config is used, prepare_slave_config()
callback might not be set. Check if this callback is set before using it.

Fixes: fa654e08 ("ASoC: dmaengine-pcm: Provide default config")
Signed-off-by: Codrin Ciubotariu <codrin.ciubotariu@microchip.com>
Link: https://lore.kernel.org/r/20220307122202.2251639-2-codrin.ciubotariu@microchip.com


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

parent 29e91a49

sound/soc/soc-generic-dmaengine-pcm.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -91,10 +91,10 @@ static int dmaengine_pcm_hw_params(struct snd_pcm_substream *substream,

		memset(&slave_config, 0, sizeof(slave_config));

		if (!pcm->config)
		prepare_slave_config = snd_dmaengine_pcm_prepare_slave_config;
		else
		if (pcm->config && pcm->config->prepare_slave_config)
		prepare_slave_config = pcm->config->prepare_slave_config;
		else
		prepare_slave_config = snd_dmaengine_pcm_prepare_slave_config;

		if (prepare_slave_config) {
		ret = prepare_slave_config(substream, params, &slave_config);