diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-04-16 21:45:54 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-04-16 21:45:54 -0400 |
| commit | 890c681275ab02623de1187f2d97fc355d76f372 (patch) | |
| tree | 9098c63135cfa468a787a9ae25fba0d4b15f4f91 /sound/soc/imx/imx-ssi.c | |
| parent | d21e0f4cd16656f71207683ee27465600ad21625 (diff) | |
| parent | 8392609969b3b37a4da5cff08161661f7a8c16af (diff) | |
Merge branch 'for-2.6.34' into for-2.6.35
Diffstat (limited to 'sound/soc/imx/imx-ssi.c')
| -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) | |||
| 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 |