aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2010-04-08 05:31:24 -0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2010-04-08 10:20:57 -0400
commit206b60e189c7cc2b4675687d66f167299a13a4d4 (patch)
tree8aebe461bb87daa9af5f867a4e7f9b8e719bff22
parent78e4fd26ef8b85c8cbb6803e18b6b1f970420e06 (diff)
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>
-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 28e55c7b14b..1bf9dc88bab 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)
655 dai->private_data = ssi; 655 dai->private_data = ssi;
656 656
657 if ((cpu_is_mx27() || cpu_is_mx21()) && 657 if ((cpu_is_mx27() || cpu_is_mx21()) &&
658 !(ssi->flags & IMX_SSI_USE_AC97)) { 658 !(ssi->flags & IMX_SSI_USE_AC97) &&
659 (ssi->flags & IMX_SSI_DMA)) {
659 ssi->flags |= IMX_SSI_DMA; 660 ssi->flags |= IMX_SSI_DMA;
660 platform = imx_ssi_dma_mx2_init(pdev, ssi); 661 platform = imx_ssi_dma_mx2_init(pdev, ssi);
661 } else 662 } else