diff options
| author | Takashi Iwai <tiwai@suse.de> | 2016-03-14 10:23:07 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2016-03-14 10:23:07 +0300 |
| commit | cdcb61a78f8d4f880a2dc1154ddfb6a05b47c092 (patch) | |
| tree | faf9d15b721ab30feeac041e78fada1b17a95c35 | |
| parent | 0ab1ace856205d10cbc1924b2d931c01ffd216a6 (diff) | |
| parent | 6ef2f68fa38bf415830f67903d87180d933e0f47 (diff) | |
| download | linux-cdcb61a78f8d4f880a2dc1154ddfb6a05b47c092.tar.xz | |
Merge branch 'for-linus' into for-next
| -rw-r--r-- | sound/pci/hda/patch_conexant.c | 7 | ||||
| -rw-r--r-- | sound/pci/hda/patch_hdmi.c | 4 | ||||
| -rw-r--r-- | sound/pci/hda/patch_realtek.c | 1 |
3 files changed, 11 insertions, 1 deletions
diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c index 6122b8ca872f..56fefbd85782 100644 --- a/sound/pci/hda/patch_conexant.c +++ b/sound/pci/hda/patch_conexant.c @@ -204,8 +204,13 @@ static void cx_auto_reboot_notify(struct hda_codec *codec) { struct conexant_spec *spec = codec->spec; - if (codec->core.vendor_id != 0x14f150f2) + switch (codec->core.vendor_id) { + case 0x14f150f2: /* CX20722 */ + case 0x14f150f4: /* CX20724 */ + break; + default: return; + } /* Turn the CX20722 codec into D3 to avoid spurious noises from the internal speaker during (and after) reboot */ diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c index eb7da9992aad..4447aa57c42c 100644 --- a/sound/pci/hda/patch_hdmi.c +++ b/sound/pci/hda/patch_hdmi.c @@ -2208,6 +2208,10 @@ static void intel_pin_eld_notify(void *audio_ptr, int port) struct hda_codec *codec = audio_ptr; int pin_nid = port + 0x04; + /* we assume only from port-B to port-D */ + if (port < 1 || port > 3) + return; + /* skip notification during system suspend (but not in runtime PM); * the state will be updated at resume */ diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 93d2156b6241..4f5ca0b9ce27 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -5556,6 +5556,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { SND_PCI_QUIRK(0x17aa, 0x2226, "ThinkPad X250", ALC292_FIXUP_TPT440_DOCK), SND_PCI_QUIRK(0x17aa, 0x2233, "Thinkpad", ALC293_FIXUP_LENOVO_SPK_NOISE), SND_PCI_QUIRK(0x17aa, 0x30bb, "ThinkCentre AIO", ALC233_FIXUP_LENOVO_LINE2_MIC_HOTKEY), + SND_PCI_QUIRK(0x17aa, 0x30e2, "ThinkCentre AIO", ALC233_FIXUP_LENOVO_LINE2_MIC_HOTKEY), SND_PCI_QUIRK(0x17aa, 0x3902, "Lenovo E50-80", ALC269_FIXUP_DMIC_THINKPAD_ACPI), SND_PCI_QUIRK(0x17aa, 0x3977, "IdeaPad S210", ALC283_FIXUP_INT_MIC), SND_PCI_QUIRK(0x17aa, 0x3978, "IdeaPad Y410P", ALC269_FIXUP_NO_SHUTUP), |