| commit | e9a8a85d9f88313264d59d40815951a46ff9a4bb | [log] [tgz] |
|---|---|---|
| author | Takashi Iwai <tiwai@suse.de> | Mon Aug 23 15:09:52 2010 +0200 |
| committer | Takashi Iwai <tiwai@suse.de> | Mon Aug 23 15:09:52 2010 +0200 |
| tree | fb7949f192c97c012ae222e666497d91afa692fa | |
| parent | d2f927d42a87b712946dee72a0b96b6b6c6aff1d [diff] | |
| parent | 70bf043b137aa9ff2711b16532774465e07a8f47 [diff] |
Merge branch 'fix/asoc' into for-linus
diff --git a/sound/soc/imx/imx-ssi.c b/sound/soc/imx/imx-ssi.c index a11daa1..c81da05 100644 --- a/sound/soc/imx/imx-ssi.c +++ b/sound/soc/imx/imx-ssi.c
@@ -254,6 +254,9 @@ dma_data = &ssi->dma_params_rx; } + if (ssi->flags & IMX_SSI_SYN) + reg = SSI_STCCR; + snd_soc_dai_set_dma_data(cpu_dai, substream, dma_data); sccr = readl(ssi->base + reg) & ~SSI_STCCR_WL_MASK;