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

Commit bd5e89c8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 2d44947a 38f1df27

sound/pci/hda/hda_intel.c

+2 −0
Original line number Diff line number Diff line
@@ -2095,6 +2095,8 @@ static struct snd_pci_quirk probe_mask_list[] __devinitdata = { 
	SND_PCI_QUIRK(0x1028, 0x20ac, "Dell Studio Desktop", 0x01),

	/* including bogus ALC268 in slot#2 that conflicts with ALC888 */

	SND_PCI_QUIRK(0x17c0, 0x4085, "Medion MD96630", 0x01),

	/* conflict of ALC268 in slot#3 (digital I/O); a temporary fix */

	SND_PCI_QUIRK(0x1179, 0xff00, "Toshiba laptop", 0x03),

	{}

};

sound/pci/hda/patch_realtek.c

+1 −0
Original line number Diff line number Diff line
@@ -10557,6 +10557,7 @@ static struct snd_pci_quirk alc262_cfg_tbl[] = { 
	SND_PCI_QUIRK(0x103c, 0x1309, "HP xw4*00", ALC262_HP_BPC),

	SND_PCI_QUIRK(0x103c, 0x130a, "HP xw6*00", ALC262_HP_BPC),

	SND_PCI_QUIRK(0x103c, 0x130b, "HP xw8*00", ALC262_HP_BPC),

	SND_PCI_QUIRK(0x103c, 0x170b, "HP xw*", ALC262_HP_BPC),

	SND_PCI_QUIRK(0x103c, 0x2800, "HP D7000", ALC262_HP_BPC_D7000_WL),

	SND_PCI_QUIRK(0x103c, 0x2801, "HP D7000", ALC262_HP_BPC_D7000_WF),

	SND_PCI_QUIRK(0x103c, 0x2802, "HP D7000", ALC262_HP_BPC_D7000_WL),

sound/pci/hda/patch_sigmatel.c

+1 −1
Original line number Diff line number Diff line
@@ -4989,7 +4989,7 @@ again: 
	case STAC_DELL_M4_3:

		spec->num_dmics = 1;

		spec->num_smuxes = 0;

		spec->num_dmuxes = 0;

		spec->num_dmuxes = 1;

		break;

	default:

		spec->num_dmics = STAC92HD71BXX_NUM_DMICS;