OpenSDV
/
linux-stable-rt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'for-2.6.36' into for-2.6.37

This commit is contained in:
Mark Brown 2010-08-23 13:38:11 +01:00
parent 72fba57931 70bf043b13
commit d89ccac5a2
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sound/soc/imx/imx-ssi.c
View File

@ -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;