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

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

Merge branch 'fix/hda' into for-linus

parents 7924f0ca 516a1ced

sound/pci/hda/hda_proc.c

+2 −1
Original line number Diff line number Diff line
@@ -399,7 +399,8 @@ static void print_conn_list(struct snd_info_buffer *buffer, 
{

	int c, curr = -1;



	if (conn_len > 1 && wid_type != AC_WID_AUD_MIX)

	if (conn_len > 1 && wid_type != AC_WID_AUD_MIX &&

	    wid_type != AC_WID_VOL_KNB)

		curr = snd_hda_codec_read(codec, nid, 0,

					  AC_VERB_GET_CONNECT_SEL, 0);

	snd_iprintf(buffer, "  Connection: %d\n", conn_len);

sound/pci/hda/patch_realtek.c

+1 −0
Original line number Diff line number Diff line
@@ -7012,6 +7012,7 @@ static int patch_alc882(struct hda_codec *codec) 
			break;

		case 0x106b1000: /* iMac 24 */

		case 0x106b2800: /* AppleTV */

		case 0x106b3e00: /* iMac 24 Aluminium */

			board_config = ALC885_IMAC24;

			break;

		case 0x106b00a1: /* Macbook (might be wrong - PCI SSID?) */

sound/pci/hda/patch_sigmatel.c

+2 −0
Original line number Diff line number Diff line
@@ -1804,6 +1804,8 @@ static struct snd_pci_quirk stac92hd71bxx_cfg_tbl[] = { 
		      "HP dv4", STAC_HP_DV5),

	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x30fc,

		      "HP dv7", STAC_HP_M4),

	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x3600,

		      "HP dv5", STAC_HP_DV5),

	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x3603,

		      "HP dv5", STAC_HP_DV5),

	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x361a,