diff options
author | Mark Brown <broonie@linaro.org> | 2013-10-24 06:24:05 -0400 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-10-24 06:24:05 -0400 |
commit | 70e0db2f7434961c778466708c032e76775b7f1e (patch) | |
tree | e762eb159000dc98090306e3a57d1ae0459312d5 /sound/soc/fsl | |
parent | 48ce3ec16a618de7fbeb8c3462f8022984f53a1d (diff) | |
parent | 90130d2e8f75c7181cef514e8a1491925f386a16 (diff) |
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 @@ | |||
25 | 25 | ||
26 | static bool filter(struct dma_chan *chan, void *param) | 26 | static bool filter(struct dma_chan *chan, void *param) |
27 | { | 27 | { |
28 | struct snd_dmaengine_dai_dma_data *dma_data = param; | ||
29 | |||
30 | if (!imx_dma_is_general_purpose(chan)) | 28 | if (!imx_dma_is_general_purpose(chan)) |
31 | return false; | 29 | return false; |
32 | 30 | ||
33 | chan->private = dma_data->filter_data; | 31 | chan->private = param; |
34 | 32 | ||
35 | return true; | 33 | return true; |
36 | } | 34 | } |