diff options
author | Mark Brown <broonie@linaro.org> | 2013-11-08 05:43:18 -0500 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-11-08 05:43:18 -0500 |
commit | 5196e6ffc253937a8f22121d28ac7192e7260793 (patch) | |
tree | 338644a50b42a361093e3e5b1235b1df186baf84 /sound/soc/fsl | |
parent | 53659907765e8b91481d9ff8a4fc78c4897043f0 (diff) | |
parent | a894bd7fb539d671149fea9420c94c0fbe6baf7a (diff) |
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 @@ | |||
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 | } |