Merge branch 'fix/asoc' into for-linus

2010-08-23 15:09:52 +02:00 · 2010-08-23 15:09:52 +02:00 · e9a8a85d9f
parent d2f927d42a 70bf043b13
commit e9a8a85d9f
1 changed files with 3 additions and 0 deletions
--- a/sound/soc/imx/imx-ssi.c
+++ b/sound/soc/imx/imx-ssi.c
@ -254,6 +254,9 @@ static int imx_ssi_hw_params(struct snd_pcm_substream *substream,
 		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;