diff options
author | Takashi Iwai <tiwai@suse.de> | 2013-09-11 12:38:45 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2013-09-11 12:38:45 +0200 |
commit | 3d0049e8529adaa36c38a7b400792f6c37b66c92 (patch) | |
tree | 7d2e30a5e3f12207305ffc76d80d310c0a95fdcc /sound/soc/atmel/atmel_ssc_dai.c | |
parent | be8cf44526d8972c2dbf6e561162dad924a712a5 (diff) | |
parent | 2ae2caff8348378c9e464353e9860ee97583c00b (diff) |
Merge tag 'asoc-v3.12-4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v3.12
A few small fixes, nothing with any broad impact but all useful for the
affected systems. The Kirkwood compatible string change is fixing up a
string just added in the merge window so that we don't get any changes
in released kernels.
Diffstat (limited to 'sound/soc/atmel/atmel_ssc_dai.c')
-rw-r--r-- | sound/soc/atmel/atmel_ssc_dai.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/atmel/atmel_ssc_dai.c b/sound/soc/atmel/atmel_ssc_dai.c index 0ecf356027f..bb53dea85b1 100644 --- a/sound/soc/atmel/atmel_ssc_dai.c +++ b/sound/soc/atmel/atmel_ssc_dai.c @@ -649,7 +649,7 @@ static int atmel_ssc_prepare(struct snd_pcm_substream *substream, dma_params = ssc_p->dma_params[dir]; ssc_writel(ssc_p->ssc->regs, CR, dma_params->mask->ssc_enable); - ssc_writel(ssc_p->ssc->regs, IER, dma_params->mask->ssc_error); + ssc_writel(ssc_p->ssc->regs, IDR, dma_params->mask->ssc_error); pr_debug("%s enabled SSC_SR=0x%08x\n", dir ? "receive" : "transmit", |