sound fixes for 3.12-final
A few small HD-audio regression fixes, mostly for stable kernels, too. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) iQIcBAABAgAGBQJScOAKAAoJEGwxgFQ9KSmknI8P/18upoLMoGn+zJYkfTFPkpXY X59FdVi9C/7wb+LQz9geHzDI4npZyLCVp2HUfwxCw12//MtB4D/zAxEC+1eyqjyK V45IUyBwly54+xQQdFdT1CkDmx6sW0Q+yfy38+KJR5IDPHSXw6IJg3pNOKJu5/Gh YB7FjnUdy2BLaIp1FDGS6NVkDfkSZZSTGvh6e1YXXennf1fhy0AalRx2y7091OhW hPjBMCatPeiiaUbTeduYrC0/6NjENNjsM/C2j489R47JtYELihwm2DHV+RxVQMGC kPmHXGIvqTZaIgX5mIrAlUfWAojx0W7Bt8I0L768ofg8NqF5x1Nohtnsq8Vmg4jz K8C7g/0AIR58bD4Q2eavVEMevlpeAaF79pTwFvShProPrposE+sv/0a38u2VarxS fBc8DgnBtZzYbaZRG/0gHEXS2WzOkaP7IMv/0B8F5W+cOQfaJCUUWZPv86ebGIcY 0y4q0rDfQ58Wq9p3QEr1Z7E38gusmvU1pLteWZ+3jw661uy3prOiJRX+O3XTrBk5 6ZABBrsMLkiNqxOeNZtFu0Gjdyq4KbNV/LSMUFz0X5E+JGGqZndvl1/AJZM6pppi dB28rAYwXD0TF9RvEZsm9uxPKKdFk+lslfTwZP1xJQimHR0WkS6chU1DjYp+2eWL 7ug1CEQAAFd4ZdEnp+dL =HqzC -----END PGP SIGNATURE----- Merge tag 'sound-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound Pull sound fixes from Takashi Iwai: "A few small HD-audio regression fixes, mostly for stable kernels, too" * tag 'sound-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: ALSA: hda - Fix silent headphone on Thinkpads with AD1984A codec ALSA: hda - Add missing initial vmaster hook at build_controls callback ALSA: hda - Fix unbalanced runtime PM refcount after S3/S4
This commit is contained in:
Коммит
182b4fd9f3
|
@ -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);
|
||||
}
|
||||
|
|
|
@ -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 */
|
||||
|
|
|
@ -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),
|
||||
{}
|
||||
};
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче