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

Commit 2523659d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
  ALSA: hda - Add missing terminators in patch_sigmatel.c
parents 5289f46b 574f3c4f

sound/pci/hda/patch_sigmatel.c

+3 −0
Original line number Diff line number Diff line
@@ -859,6 +859,7 @@ static struct hda_verb stac92hd83xxx_core_init[] = { 


	/* power state controls amps */

	{ 0x01, AC_VERB_SET_EAPD, 1 << 2},

	{}

};



static struct hda_verb stac92hd71bxx_core_init[] = {
@@ -870,6 +871,7 @@ static struct hda_verb stac92hd71bxx_core_init[] = { 
	{ 0x0a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},

	{ 0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},

	{ 0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},

	{}

};



#define HD_DISABLE_PORTF 2
@@ -1667,6 +1669,7 @@ static struct snd_pci_quirk stac92hd83xxx_cfg_tbl[] = { 
	/* SigmaTel reference board */

	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2668,

		      "DFI LanParty", STAC_92HD71BXX_REF),

	{} /* terminator */

};



static unsigned int ref92hd71bxx_pin_configs[11] = {