diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-12-16 21:40:02 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-12-16 21:40:02 +0100 |
| commit | a62bbe309338b73482be0de8fc2833d63771d61e (patch) | |
| tree | 5531742a1c79e7083fa5a9f4260c09e3e61d3e11 /sound/soc/atmel | |
| parent | 432ac1a2c028acb289d90f918e3a7b79e4ac8c07 (diff) | |
| parent | c52e5698efef1d9999d744be001be62d9fcabf55 (diff) | |
Merge tag 'asoc-v3.19-2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Merge window fixes for v3.19
A smattering of driver specific fixes here, some more cleanup of the
Exynos7 and Intel ACPI support plus a fix for register cache sync on the
pcm512x driver which has been lurking for a while.
Diffstat (limited to 'sound/soc/atmel')
| -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 b1cc2a4a7fc0..99ff35e2a25d 100644 --- a/sound/soc/atmel/atmel_ssc_dai.c +++ b/sound/soc/atmel/atmel_ssc_dai.c @@ -267,7 +267,7 @@ static void atmel_ssc_shutdown(struct snd_pcm_substream *substream, if (!ssc_p->dir_mask) { if (ssc_p->initialized) { /* Shutdown the SSC clock. */ - pr_debug("atmel_ssc_dau: Stopping clock\n"); + pr_debug("atmel_ssc_dai: Stopping clock\n"); clk_disable(ssc_p->ssc->clk); free_irq(ssc_p->ssc->irq, ssc_p); |