Skip to content

Commit

Permalink
Merge branch 'fix/asoc' into for-linus
Browse files Browse the repository at this point in the history
  • Loading branch information
Takashi Iwai committed Aug 23, 2010
2 parents d2f927d + 70bf043 commit e9a8a85
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions sound/soc/imx/imx-ssi.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit e9a8a85

Please sign in to comment.