From 60e2293acac1201bf0ebaedef22fc599db504dc2 Mon Sep 17 00:00:00 2001 From: Axel Lin Date: Fri, 9 Dec 2011 18:43:20 +0800 Subject: [PATCH] --- yaml --- r: 283912 b: refs/heads/master c: 7fcadfd17699b6b7973ce4f99eae47a11b4c44a7 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/sound/soc/codecs/wm8961.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 6c74e671b658..d430006beb7d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 46ce904f7d4788ebc2ca7894fb56b9aa5b84af2d +refs/heads/master: 7fcadfd17699b6b7973ce4f99eae47a11b4c44a7 diff --git a/trunk/sound/soc/codecs/wm8961.c b/trunk/sound/soc/codecs/wm8961.c index dc087c155975..58fbf0a87b6a 100644 --- a/trunk/sound/soc/codecs/wm8961.c +++ b/trunk/sound/soc/codecs/wm8961.c @@ -422,11 +422,11 @@ static int wm8961_spk_event(struct snd_soc_dapm_widget *w, } if (event & SND_SOC_DAPM_PRE_PMD) { - /* Enable the amplifier */ + /* Disable the amplifier */ spk_reg &= ~(WM8961_SPKL_ENA | WM8961_SPKR_ENA); snd_soc_write(codec, WM8961_CLASS_D_CONTROL_1, spk_reg); - /* Enable the PGA */ + /* Disable the PGA */ pwr_reg &= ~(WM8961_SPKL_PGA | WM8961_SPKR_PGA); snd_soc_write(codec, WM8961_PWR_MGMT_2, pwr_reg); }