Merge branch 'fix/asoc' into for-linus

e9a8a85d · Takashi Iwai · d2f927d4 · 70bf043b · e9a8a85d
Commit e9a8a85d authored Aug 23, 2010 by Takashi Iwai
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

sound/soc/imx/imx-ssi.c sound/soc/imx/imx-ssi.c +3 -0

No files found.
--- 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;