From ec1bbe0bbd612069f52454b3ca4fccb575230c3d Mon Sep 17 00:00:00 2001
From: Sascha Hauer <s.hauer@pengutronix.de>
Date: Thu, 8 Apr 2010 11:31:24 +0200
Subject: [PATCH] --- yaml --- r: 189954 b: refs/heads/master c:
 206b60e189c7cc2b4675687d66f167299a13a4d4 h: refs/heads/master v: v3

---
 [refs]                        | 2 +-
 trunk/sound/soc/imx/imx-ssi.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 5f74bceaebb4..8c4d4b3fe3d5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 78e4fd26ef8b85c8cbb6803e18b6b1f970420e06
+refs/heads/master: 206b60e189c7cc2b4675687d66f167299a13a4d4
diff --git a/trunk/sound/soc/imx/imx-ssi.c b/trunk/sound/soc/imx/imx-ssi.c
index 28e55c7b14b4..1bf9dc88babf 100644
--- a/trunk/sound/soc/imx/imx-ssi.c
+++ b/trunk/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