Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 62ddc004 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'fix/hda' of git://github.com/tiwai/sound 

* 'fix/hda' of git://github.com/tiwai/sound:
  ALSA: HDA: conexant support for Lenovo T520/W520
  ALSA: hda - Add position_fix quirk for Dell Inspiron 1010
parents fd11e153 ca201c09

sound/pci/hda/hda_intel.c

+1 −0
Original line number Diff line number Diff line
@@ -2370,6 +2370,7 @@ static int azx_dev_free(struct snd_device *device) 
static struct snd_pci_quirk position_fix_list[] __devinitdata = {

	SND_PCI_QUIRK(0x1028, 0x01cc, "Dell D820", POS_FIX_LPIB),

	SND_PCI_QUIRK(0x1028, 0x01de, "Dell Precision 390", POS_FIX_LPIB),

	SND_PCI_QUIRK(0x1028, 0x02c6, "Dell Inspiron 1010", POS_FIX_LPIB),

	SND_PCI_QUIRK(0x103c, 0x306d, "HP dv3", POS_FIX_LPIB),

	SND_PCI_QUIRK(0x1043, 0x813d, "ASUS P5AD2", POS_FIX_LPIB),

	SND_PCI_QUIRK(0x1043, 0x81b3, "ASUS", POS_FIX_LPIB),

sound/pci/hda/patch_conexant.c

+1 −0
Original line number Diff line number Diff line
@@ -3110,6 +3110,7 @@ static const struct snd_pci_quirk cxt5066_cfg_tbl[] = { 
	SND_PCI_QUIRK(0x17aa, 0x21c5, "Thinkpad Edge 13", CXT5066_THINKPAD),

	SND_PCI_QUIRK(0x17aa, 0x21c6, "Thinkpad Edge 13", CXT5066_ASUS),

 	SND_PCI_QUIRK(0x17aa, 0x215e, "Lenovo Thinkpad", CXT5066_THINKPAD),

	SND_PCI_QUIRK(0x17aa, 0x21cf, "Lenovo T520 & W520", CXT5066_AUTO),

	SND_PCI_QUIRK(0x17aa, 0x21da, "Lenovo X220", CXT5066_THINKPAD),

	SND_PCI_QUIRK(0x17aa, 0x21db, "Lenovo X220-tablet", CXT5066_THINKPAD),

	SND_PCI_QUIRK(0x17aa, 0x3a0d, "Lenovo U350", CXT5066_ASUS),