diff options
author | Mark Brown <broonie@linaro.org> | 2013-10-24 12:24:05 +0200 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-10-24 12:24:05 +0200 |
commit | 70e0db2f7434961c778466708c032e76775b7f1e (patch) | |
tree | e762eb159000dc98090306e3a57d1ae0459312d5 /sound/soc/fsl | |
parent | Merge remote-tracking branch 'asoc/topic/devm' into asoc-next (diff) | |
parent | ASoC: dmaengine: Use filter_data rather than dma_data for compat requests (diff) | |
download | linux-70e0db2f7434961c778466708c032e76775b7f1e.tar.xz linux-70e0db2f7434961c778466708c032e76775b7f1e.zip |
Merge remote-tracking branch 'asoc/topic/dma' into asoc-next
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; } |