diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-04-16 10:03:36 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-04-16 10:03:36 +0200 |
| commit | d336905e00f208bcb89c719022c11dd3d976597a (patch) | |
| tree | 6a5e3cf552231abe24df3cfae8f5d3884c7a1b4f /sound/soc/imx/imx-ssi.c | |
| parent | 0d0fb0f9c5fddef4a10242fe3337f00f528a3099 (diff) | |
| parent | 8392609969b3b37a4da5cff08161661f7a8c16af (diff) | |
| download | blackbird-op-linux-d336905e00f208bcb89c719022c11dd3d976597a.tar.gz blackbird-op-linux-d336905e00f208bcb89c719022c11dd3d976597a.zip | |
Merge branch 'fix/asoc' into for-linus
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) 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 |
