aboutsummaryrefslogtreecommitdiff
path: root/sound/soc/fsl/imx-pcm-dma.c
diff options
context:
space:
mode:
authorJon Medhurst <tixy@linaro.org>2015-03-27 16:01:16 +0000
committerJon Medhurst <tixy@linaro.org>2015-03-27 16:01:16 +0000
commitc3f305bdfe7f5ec06204b9e4c58dd24dd82c1106 (patch)
tree4b1920e09de772120cc6016e5541a7a3e1d57963 /sound/soc/fsl/imx-pcm-dma.c
parent2f91cb3e0ef905204dc42c69cf623e91d707d2ed (diff)
parent3fba00c16a96323fdeaca97d45d8ec11315f602a (diff)
Merge branch 'lsk-3.10-armlt-asoc' into integration-lsk-3.10-juno-android
Conflicts: arch/arm64/boot/dts/juno.dts linaro/configs/vexpress64.conf
Diffstat (limited to 'sound/soc/fsl/imx-pcm-dma.c')
-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 c246fb514930..9e410ecab613 100644
--- a/sound/soc/fsl/imx-pcm-dma.c
+++ b/sound/soc/fsl/imx-pcm-dma.c
@@ -24,12 +24,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;
}