diff options
| author | Jon Medhurst <tixy@linaro.org> | 2015-08-04 16:13:57 +0100 |
|---|---|---|
| committer | Jon Medhurst <tixy@linaro.org> | 2015-08-04 16:13:57 +0100 |
| commit | 703dca558a55639c32158bd65bae44222193a1e4 (patch) | |
| tree | 830ab66d152a33d96042c32fceedc0468d54e548 /sound/soc/fsl/imx-pcm-dma.c | |
| parent | b76dbc19ecdad60742bd51fba34092a0c2d81dc6 (diff) | |
| parent | 90a59173ce59c546009067399c7c42df29d58730 (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.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 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; } |