Commit f7c0bfa0 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'for-linus' into for-next 

Merge the 3.8 devel branch for correcting the newly added PB desktop
fixup with the automute support.
parents 1f578250 0712eea3

sound/pci/hda/hda_codec.c

+2 −3
Original line number Original line Diff line number Diff line
@@ -3826,6 +3826,7 @@ static void hda_call_codec_resume(struct hda_codec *codec) 
	hda_set_power_state(codec, AC_PWRST_D0);

	hda_set_power_state(codec, AC_PWRST_D0);

	restore_shutup_pins(codec);

	restore_shutup_pins(codec);

	hda_exec_init_verbs(codec);

	hda_exec_init_verbs(codec);

	snd_hda_jack_set_dirty_all(codec);

	if (codec->patch_ops.resume)

	if (codec->patch_ops.resume)

		codec->patch_ops.resume(codec);

		codec->patch_ops.resume(codec);

	else {

	else {
@@ -3837,10 +3838,8 @@ static void hda_call_codec_resume(struct hda_codec *codec) 




	if (codec->jackpoll_interval)

	if (codec->jackpoll_interval)

		hda_jackpoll_work(&codec->jackpoll_work.work);

		hda_jackpoll_work(&codec->jackpoll_work.work);

	else {

	else

		snd_hda_jack_set_dirty_all(codec);

		snd_hda_jack_report_sync(codec);

		snd_hda_jack_report_sync(codec);

	}





	codec->in_pm = 0;

	codec->in_pm = 0;

	snd_hda_power_down(codec); /* flag down before returning */

	snd_hda_power_down(codec); /* flag down before returning */

sound/pci/hda/patch_realtek.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -1308,6 +1308,7 @@ static const struct snd_pci_quirk alc880_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x1584, 0x9077, "Uniwill P53", ALC880_FIXUP_VOL_KNOB),

	SND_PCI_QUIRK(0x1584, 0x9077, "Uniwill P53", ALC880_FIXUP_VOL_KNOB),

	SND_PCI_QUIRK(0x161f, 0x203d, "W810", ALC880_FIXUP_W810),

	SND_PCI_QUIRK(0x161f, 0x203d, "W810", ALC880_FIXUP_W810),

	SND_PCI_QUIRK(0x161f, 0x205d, "Medion Rim 2150", ALC880_FIXUP_MEDION_RIM),

	SND_PCI_QUIRK(0x161f, 0x205d, "Medion Rim 2150", ALC880_FIXUP_MEDION_RIM),

	SND_PCI_QUIRK(0x1631, 0xe011, "PB 13201056", ALC880_FIXUP_6ST),

	SND_PCI_QUIRK(0x1734, 0x107c, "FSC F1734", ALC880_FIXUP_F1734),

	SND_PCI_QUIRK(0x1734, 0x107c, "FSC F1734", ALC880_FIXUP_F1734),

	SND_PCI_QUIRK(0x1734, 0x1094, "FSC Amilo M1451G", ALC880_FIXUP_FUJITSU),

	SND_PCI_QUIRK(0x1734, 0x1094, "FSC Amilo M1451G", ALC880_FIXUP_FUJITSU),

	SND_PCI_QUIRK(0x1734, 0x10ac, "FSC AMILO Xi 1526", ALC880_FIXUP_F1734),

	SND_PCI_QUIRK(0x1734, 0x10ac, "FSC AMILO Xi 1526", ALC880_FIXUP_F1734),