diff options
author | Takashi Iwai <tiwai@suse.de> | 2016-11-29 08:20:13 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2016-11-29 08:20:13 +0100 |
commit | 55d2b19071f1868d7db974af694dcb707b2c9f1f (patch) | |
tree | 3cd074b2af76c32895a55b98bf0291beb7c82acd /sound/pci/hda/patch_realtek.c | |
parent | 2e57069c869f3009ae70a429d6719a545de43522 (diff) | |
parent | b5337cfe067e96b8a98699da90c7dcd2bec21133 (diff) |
Merge branch 'for-linus' into for-next
Diffstat (limited to 'sound/pci/hda/patch_realtek.c')
-rw-r--r-- | sound/pci/hda/patch_realtek.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 47224c69cc06..64c22ccf239b 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -5917,6 +5917,9 @@ static const struct snd_hda_pin_quirk alc269_pin_fixup_tbl[] = { {0x12, 0x90a60180}, {0x14, 0x90170120}, {0x21, 0x02211030}), + SND_HDA_PIN_QUIRK(0x10ec0255, 0x1028, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE, + {0x1b, 0x01011020}, + {0x21, 0x02211010}), SND_HDA_PIN_QUIRK(0x10ec0256, 0x1028, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE, {0x12, 0x90a60160}, {0x14, 0x90170120}, @@ -6907,8 +6910,6 @@ static const struct hda_fixup alc662_fixups[] = { .v.pins = (const struct hda_pintbl[]) { { 0x15, 0x40f000f0 }, /* disabled */ { 0x16, 0x40f000f0 }, /* disabled */ - { 0x18, 0x01014011 }, /* LO */ - { 0x1a, 0x01014012 }, /* LO */ { } } }, |