diff options
| author | Codrin Ciubotariu <codrin.ciubotariu@microchip.com> | 2022-03-07 13:21:57 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2022-03-08 14:38:56 +0100 |
| commit | 9a1e13440a4f2e7566fd4c5eae6a53e6400e08a4 (patch) | |
| tree | 22759f4b992c12a5a0cecf37c6fb2d67e0eb8c10 /sound/soc/soc-generic-dmaengine-pcm.c | |
| parent | ASoC: fsl_sai: Cleanups and 1:1 bclk:mclk ratio support (diff) | |
| download | linux-9a1e13440a4f2e7566fd4c5eae6a53e6400e08a4.tar.xz linux-9a1e13440a4f2e7566fd4c5eae6a53e6400e08a4.zip | |
ASoC: dmaengine: do not use a NULL prepare_slave_config() callback
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: fa654e085300 ("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>
Diffstat (limited to 'sound/soc/soc-generic-dmaengine-pcm.c')
| -rw-r--r-- | sound/soc/soc-generic-dmaengine-pcm.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/soc-generic-dmaengine-pcm.c b/sound/soc/soc-generic-dmaengine-pcm.c index 285441d6aeed..2ab2ddc1294d 100644 --- a/sound/soc/soc-generic-dmaengine-pcm.c +++ b/sound/soc/soc-generic-dmaengine-pcm.c @@ -86,10 +86,10 @@ static int dmaengine_pcm_hw_params(struct snd_soc_component *component, 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) { int ret = prepare_slave_config(substream, params, &slave_config); |