summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2010-04-08 11:31:24 +0200
committerMark Brown <broonie@opensource.wolfsonmicro.com>2010-04-08 15:20:57 +0100
commit206b60e189c7cc2b4675687d66f167299a13a4d4 (patch)
tree8aebe461bb87daa9af5f867a4e7f9b8e719bff22 /sound
parent78e4fd26ef8b85c8cbb6803e18b6b1f970420e06 (diff)
downloadlinux-stable-206b60e189c7cc2b4675687d66f167299a13a4d4.tar.gz
linux-stable-206b60e189c7cc2b4675687d66f167299a13a4d4.tar.bz2
linux-stable-206b60e189c7cc2b4675687d66f167299a13a4d4.zip
ASoC: imx-ssi: honor IMX_SSI_DMA flag
When checking if we are DMA capable we have to check for the IMX_SSI_DMA flag which is already set from platform_data instead of setting it again when we want to do DMA. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Acked-by: Liam Girdwood <lrg@Slimlogic.co.uk> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/imx/imx-ssi.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/soc/imx/imx-ssi.c b/sound/soc/imx/imx-ssi.c
index 28e55c7b14b4..1bf9dc88babf 100644
--- a/sound/soc/imx/imx-ssi.c
+++ b/sound/soc/imx/imx-ssi.c
@@ -655,7 +655,8 @@ static int imx_ssi_probe(struct platform_device *pdev)
dai->private_data = ssi;
if ((cpu_is_mx27() || cpu_is_mx21()) &&
- !(ssi->flags & IMX_SSI_USE_AC97)) {
+ !(ssi->flags & IMX_SSI_USE_AC97) &&
+ (ssi->flags & IMX_SSI_DMA)) {
ssi->flags |= IMX_SSI_DMA;
platform = imx_ssi_dma_mx2_init(pdev, ssi);
} else