diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2010-04-08 11:31:24 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-04-08 16:20:57 +0200 |
| commit | 206b60e189c7cc2b4675687d66f167299a13a4d4 (patch) | |
| tree | 8aebe461bb87daa9af5f867a4e7f9b8e719bff22 /sound/soc | |
| parent | ASoC: wm2000: remove unused #include <linux/version.h> (diff) | |
| download | linux-206b60e189c7cc2b4675687d66f167299a13a4d4.tar.xz linux-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/soc')
| -rw-r--r-- | sound/soc/imx/imx-ssi.c | 3 |
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 |