From: Sascha Hauer <s.hauer@pengutronix.de>
Date: Thu, 8 Apr 2010 09:31:24 +0000 (+0200)
Subject: ASoC: imx-ssi: honor IMX_SSI_DMA flag
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=206b60e189c7cc2b4675687d66f167299a13a4d4;p=linux-beck.git

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>
---

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