ASoC: imx-ssi: honor IMX_SSI_DMA flag
authorSascha Hauer <s.hauer@pengutronix.de>
Thu, 8 Apr 2010 09:31:24 +0000 (11:31 +0200)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 8 Apr 2010 14:20:57 +0000 (15:20 +0100)
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>
sound/soc/imx/imx-ssi.c

index 28e55c7b14b4cffa35b3b70c352a1a239eb3ed3b..1bf9dc88babf66a5f071a7809c946c7a1820f16e 100644 (file)
@@ -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