diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-08-23 08:38:11 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-08-23 08:38:11 -0400 |
| commit | d89ccac5a242a6547bcb8073f1ff65bdfa042266 (patch) | |
| tree | 7e0203a2af342ccb2638a8ccc8ab55948654955c /sound | |
| parent | 72fba57931c703ad71849b2521226c9bcb7d6688 (diff) | |
| parent | 70bf043b137aa9ff2711b16532774465e07a8f47 (diff) | |
Merge branch 'for-2.6.36' into for-2.6.37
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/imx/imx-ssi.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sound/soc/imx/imx-ssi.c b/sound/soc/imx/imx-ssi.c index 2601be5a4ed8..26716e9626f4 100644 --- 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, | |||
| 254 | dma_data = &ssi->dma_params_rx; | 254 | dma_data = &ssi->dma_params_rx; |
| 255 | } | 255 | } |
| 256 | 256 | ||
| 257 | if (ssi->flags & IMX_SSI_SYN) | ||
| 258 | reg = SSI_STCCR; | ||
| 259 | |||
| 257 | snd_soc_dai_set_dma_data(cpu_dai, substream, dma_data); | 260 | snd_soc_dai_set_dma_data(cpu_dai, substream, dma_data); |
| 258 | 261 | ||
| 259 | sccr = readl(ssi->base + reg) & ~SSI_STCCR_WL_MASK; | 262 | sccr = readl(ssi->base + reg) & ~SSI_STCCR_WL_MASK; |