diff options
author | Mark Brown <broonie@linaro.org> | 2013-11-08 11:43:18 +0100 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-11-08 11:43:18 +0100 |
commit | 5196e6ffc253937a8f22121d28ac7192e7260793 (patch) | |
tree | 338644a50b42a361093e3e5b1235b1df186baf84 /sound/soc/fsl | |
parent | Merge remote-tracking branch 'asoc/fix/ak4642' into asoc-linus (diff) | |
parent | ASoC: generic-dmaengine-pcm: Clear slave_config memory (diff) | |
download | linux-5196e6ffc253937a8f22121d28ac7192e7260793.tar.xz linux-5196e6ffc253937a8f22121d28ac7192e7260793.zip |
Merge remote-tracking branch 'asoc/fix/dma' into asoc-linus
Diffstat (limited to 'sound/soc/fsl')
-rw-r--r-- | sound/soc/fsl/imx-pcm-dma.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sound/soc/fsl/imx-pcm-dma.c b/sound/soc/fsl/imx-pcm-dma.c index 4dc1296688e9..aee23077080a 100644 --- a/sound/soc/fsl/imx-pcm-dma.c +++ b/sound/soc/fsl/imx-pcm-dma.c @@ -25,12 +25,10 @@ static bool filter(struct dma_chan *chan, void *param) { - struct snd_dmaengine_dai_dma_data *dma_data = param; - if (!imx_dma_is_general_purpose(chan)) return false; - chan->private = dma_data->filter_data; + chan->private = param; return true; } |