tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge branch 'fix/hda' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

* 'fix/hda' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
ALSA: hda - Add probe_mask default for Toshiba laptop with ALC268
ALSA: hda - Add quirk for new HP xw series
ALSA: hda - Fix digital mic on dell-m4-1 and dell-m4-3

Linus Torvalds bd5e89c8 2d44947a

+4 -1
+2
sound/pci/hda/hda_intel.c
··· 2095 2095 SND_PCI_QUIRK(0x1028, 0x20ac, "Dell Studio Desktop", 0x01), 2096 2096 /* including bogus ALC268 in slot#2 that conflicts with ALC888 */ 2097 2097 SND_PCI_QUIRK(0x17c0, 0x4085, "Medion MD96630", 0x01), 2098 + /* conflict of ALC268 in slot#3 (digital I/O); a temporary fix */ 2099 + SND_PCI_QUIRK(0x1179, 0xff00, "Toshiba laptop", 0x03), 2098 2100 {} 2099 2101 }; 2100 2102
+1
sound/pci/hda/patch_realtek.c
··· 10557 10557 SND_PCI_QUIRK(0x103c, 0x1309, "HP xw4*00", ALC262_HP_BPC), 10558 10558 SND_PCI_QUIRK(0x103c, 0x130a, "HP xw6*00", ALC262_HP_BPC), 10559 10559 SND_PCI_QUIRK(0x103c, 0x130b, "HP xw8*00", ALC262_HP_BPC), 10560 + SND_PCI_QUIRK(0x103c, 0x170b, "HP xw*", ALC262_HP_BPC), 10560 10561 SND_PCI_QUIRK(0x103c, 0x2800, "HP D7000", ALC262_HP_BPC_D7000_WL), 10561 10562 SND_PCI_QUIRK(0x103c, 0x2801, "HP D7000", ALC262_HP_BPC_D7000_WF), 10562 10563 SND_PCI_QUIRK(0x103c, 0x2802, "HP D7000", ALC262_HP_BPC_D7000_WL),
+1 -1
sound/pci/hda/patch_sigmatel.c
··· 4989 4989 case STAC_DELL_M4_3: 4990 4990 spec->num_dmics = 1; 4991 4991 spec->num_smuxes = 0; 4992 - spec->num_dmuxes = 0; 4992 + spec->num_dmuxes = 1; 4993 4993 break; 4994 4994 default: 4995 4995 spec->num_dmics = STAC92HD71BXX_NUM_DMICS;