Commit 51408e8a authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'fix/hda' into topic/hda

parents b98b7b34 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_conexant.c

+12 −2
Original line number Diff line number Diff line
@@ -347,6 +347,7 @@ static int conexant_mux_enum_put(struct snd_kcontrol *kcontrol, 
				     &spec->cur_mux[adc_idx]);

}



#ifdef CONFIG_SND_JACK

static int conexant_add_jack(struct hda_codec *codec,

		hda_nid_t nid, int type)

{
@@ -394,7 +395,6 @@ static void conexant_report_jack(struct hda_codec *codec, hda_nid_t nid) 


static int conexant_init_jacks(struct hda_codec *codec)

{

#ifdef CONFIG_SND_JACK

	struct conexant_spec *spec = codec->spec;

	int i;
@@ -422,10 +422,19 @@ static int conexant_init_jacks(struct hda_codec *codec) 
			++hv;

		}

	}

#endif

	return 0;



}

#else

static inline void conexant_report_jack(struct hda_codec *codec, hda_nid_t nid)

{

}



static inline int conexant_init_jacks(struct hda_codec *codec)

{

	return 0;

}

#endif



static int conexant_init(struct hda_codec *codec)

{
@@ -1566,6 +1575,7 @@ static struct snd_pci_quirk cxt5047_cfg_tbl[] = { 
	SND_PCI_QUIRK(0x103c, 0x30a5, "HP DV5200T/DV8000T", CXT5047_LAPTOP_HP),

	SND_PCI_QUIRK(0x103c, 0x30b2, "HP DV2000T/DV3000T", CXT5047_LAPTOP),

	SND_PCI_QUIRK(0x103c, 0x30b5, "HP DV2000Z", CXT5047_LAPTOP),

	SND_PCI_QUIRK(0x103c, 0x30cf, "HP DV6700", CXT5047_LAPTOP),

	SND_PCI_QUIRK(0x1179, 0xff31, "Toshiba P100", CXT5047_LAPTOP_EAPD),

	{}

};

sound/pci/hda/patch_realtek.c

+2 −0
Original line number Diff line number Diff line
@@ -7053,12 +7053,14 @@ 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?) */

		case 0x106b00a4: /* MacbookPro4,1 */

		case 0x106b2c00: /* Macbook Pro rev3 */

		case 0x106b3600: /* Macbook 3.1 */

		case 0x106b3800: /* MacbookPro4,1 - latter revision */

			board_config = ALC885_MBP3;

			break;

		default:

sound/pci/hda/patch_sigmatel.c

+2 −0
Original line number Diff line number Diff line
@@ -1801,6 +1801,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,