summaryrefslogtreecommitdiff
path: root/sound/soc/fsl
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-11-08 10:43:18 +0000
committerMark Brown <broonie@linaro.org>2013-11-08 10:43:18 +0000
commit5196e6ffc253937a8f22121d28ac7192e7260793 (patch)
tree338644a50b42a361093e3e5b1235b1df186baf84 /sound/soc/fsl
parent53659907765e8b91481d9ff8a4fc78c4897043f0 (diff)
parenta894bd7fb539d671149fea9420c94c0fbe6baf7a (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.c4
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;
}