sound fixes for 3.12-final
Linus,
please pull sound fixes for v3.12-final from:
git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git tags/sound-3.12
The topmost commit is 1ac3293095deb01ccc491f3c171e12722ebd0bc9
----------------------------------------------------------------
sound fixes for 3.12-final
A few small HD-audio regression fixes, mostly for stable kernels, too.
----------------------------------------------------------------
Takashi Iwai (3):
ALSA: hda - Fix unbalanced runtime PM refcount after S3/S4
ALSA: hda - Add missing initial vmaster hook at build_controls callback
ALSA: hda - Fix silent headphone on Thinkpads with AD1984A codec
--- sound/pci/hda/hda_codec.c | 4 ++-- sound/pci/hda/hda_generic.c | 4 +++- sound/pci/hda/patch_analog.c | 18 +++++++++++++++++- 3 files changed, 22 insertions(+), 4 deletions(-)
sound/pci/hda/hda_codec.c +2 -2
@@ -4864,8 +4864,8 @@ static void hda_power_work(struct work_struct *work)spin_unlock (&codec->power_lock); state =hda_call_codec_suspend (codec, true); - codec->pm_down_notified =0 ; -if (!bus->power_keep_link_on && (state &AC_PWRST_CLK_STOP_OK )) { +if (!codec->pm_down_notified && + !bus->power_keep_link_on && (state &AC_PWRST_CLK_STOP_OK )) { codec->pm_down_notified =1 ;hda_call_pm_notify (bus, false); }
sound/pci/hda/hda_generic.c +3 -1
@@ -4475,9 +4475,11 @@ int snd_hda_gen_build_controls(struct hda_codec *codec) true, &spec->vmaster_mute.sw_kctl);if (err <0 )return err; -if (spec->vmaster_mute.hook) +if (spec->vmaster_mute.hook) {snd_hda_add_vmaster_hook (codec, &spec->vmaster_mute, spec->vmaster_mute_enum); +snd_hda_sync_vmaster_hook (&spec->vmaster_mute); + } }free_kctls (spec);/* no longer needed */
sound/pci/hda/patch_analog.c +17 -1
@@ -968,6 +968,15 @@ static void ad1884_fixup_hp_eapd(struct hda_codec *codec, } } +static void ad1884_fixup_thinkpad (struct hda_codec *codec, +const struct hda_fixup *fix,int action) +{ +struct ad198x_spec *spec = codec->spec; + +if (action ==HDA_FIXUP_ACT_PRE_PROBE ) + spec->gen.keep_eapd_on =1 ; +} +/* set magic COEFs for dmic */ static const struct hda_verb ad1884_dmic_init_verbs[] = { {0x01 ,AC_VERB_SET_COEF_INDEX ,0x13f7 },
@@ -979,6 +988,7 @@ enum {AD1884_FIXUP_AMP_OVERRIDE ,AD1884_FIXUP_HP_EAPD ,AD1884_FIXUP_DMIC_COEF , +AD1884_FIXUP_THINKPAD , AD1884_FIXUP_HP_TOUCHSMART, };
@@ -997,6 +1007,12 @@ static const struct hda_fixup ad1884_fixups[] = { .type = HDA_FIXUP_VERBS, .v.verbs = ad1884_dmic_init_verbs, }, + [AD1884_FIXUP_THINKPAD] = { + .type = HDA_FIXUP_FUNC, + .v.func = ad1884_fixup_thinkpad, + .chained = true, + .chain_id = AD1884_FIXUP_DMIC_COEF, + }, [AD1884_FIXUP_HP_TOUCHSMART] = { .type = HDA_FIXUP_VERBS, .v.verbs = ad1884_dmic_init_verbs,
@@ -1008,7 +1024,7 @@ static const struct hda_fixup ad1884_fixups[] = {static const struct snd_pci_quirk ad1884_fixup_tbl[] = {SND_PCI_QUIRK (0x103c ,0x2a82 ,"HP Touchsmart" ,AD1884_FIXUP_HP_TOUCHSMART ),SND_PCI_QUIRK_VENDOR (0x103c ,"HP" ,AD1884_FIXUP_HP_EAPD ), -SND_PCI_QUIRK_VENDOR (0x17aa ,"Lenovo Thinkpad" ,AD1884_FIXUP_DMIC_COEF ), +SND_PCI_QUIRK_VENDOR (0x17aa ,"Lenovo Thinkpad" ,AD1884_FIXUP_THINKPAD ), {} };