diff options
| author | David S. Miller <davem@davemloft.net> | 2010-04-21 03:50:39 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-04-21 03:50:39 -0400 |
| commit | e04997b13a2c2fc93af970fe95fd29a74db113e8 (patch) | |
| tree | a84ec3368edc3c2568a0d6acdfa0d0e50d8cacf7 /sound/soc/imx/imx-ssi.c | |
| parent | 6651ffc8e8bdd5fb4b7d1867c6cfebb4f309512c (diff) | |
| parent | 05ce7bfe547c9fa967d9cab6c37867a9cb6fb3fa (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
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 0bcc6d7d9471..80b4fee2442b 100644 --- a/sound/soc/imx/imx-ssi.c +++ b/sound/soc/imx/imx-ssi.c | |||
| @@ -656,7 +656,8 @@ static int imx_ssi_probe(struct platform_device *pdev) | |||
| 656 | dai->private_data = ssi; | 656 | dai->private_data = ssi; |
| 657 | 657 | ||
| 658 | if ((cpu_is_mx27() || cpu_is_mx21()) && | 658 | if ((cpu_is_mx27() || cpu_is_mx21()) && |
| 659 | !(ssi->flags & IMX_SSI_USE_AC97)) { | 659 | !(ssi->flags & IMX_SSI_USE_AC97) && |
| 660 | (ssi->flags & IMX_SSI_DMA)) { | ||
| 660 | ssi->flags |= IMX_SSI_DMA; | 661 | ssi->flags |= IMX_SSI_DMA; |
| 661 | platform = imx_ssi_dma_mx2_init(pdev, ssi); | 662 | platform = imx_ssi_dma_mx2_init(pdev, ssi); |
| 662 | } else | 663 | } else |