Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2b67f8ba authored by Xiubo Li's avatar Xiubo Li Committed by Mark Brown
Browse files

ASoC: dmaengine: Add config parameter NULL check. 



Because the "ASoC: dmaengine-pcm: Provide default config" has provided
us one defualt config of DMA. When using this, the config parameter of
devm_snd_dmaengine_pcm_register() will be NULL, so here we need to have
a check before using it.

Signed-off-by: default avatarXiubo Li <Li.Xiubo@freescale.com>
Acked-by: default avatarLars-Peter Clausen <lars@metafoo.de>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent e9036c2a

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

+2 −2
Original line number Diff line number Diff line
@@ -299,7 +299,7 @@ static int dmaengine_pcm_request_chan_of(struct dmaengine_pcm *pcm, 
	    !dev->of_node)

		return 0;



	if (config->dma_dev) {

	if (config && config->dma_dev) {

		/*

		 * If this warning is seen, it probably means that your Linux

		 * device structure does not match your HW device structure.
@@ -317,7 +317,7 @@ static int dmaengine_pcm_request_chan_of(struct dmaengine_pcm *pcm, 
			name = "rx-tx";

		else

			name = dmaengine_pcm_dma_channel_names[i];

		if (config->chan_names[i])

		if (config && config->chan_names[i])

			name = config->chan_names[i];

		chan = dma_request_slave_channel_reason(dev, name);

		if (IS_ERR(chan)) {