| commit | d89ccac5a242a6547bcb8073f1ff65bdfa042266 | [log] [tgz] |
|---|---|---|
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | Mon Aug 23 13:38:11 2010 +0100 |
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | Mon Aug 23 13:38:11 2010 +0100 |
| tree | 7e0203a2af342ccb2638a8ccc8ab55948654955c | |
| parent | 72fba57931c703ad71849b2521226c9bcb7d6688 [diff] | |
| parent | 70bf043b137aa9ff2711b16532774465e07a8f47 [diff] |
Merge branch 'for-2.6.36' into for-2.6.37
diff --git a/sound/soc/imx/imx-ssi.c b/sound/soc/imx/imx-ssi.c index 2601be5..26716e9 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;