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

Commit 7d39cf62 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'topic/hda' into for-linus

parents a3087ae9 ecd21626

sound/pci/hda/hda_intel.c

+1 −0
Original line number Diff line number Diff line
@@ -2358,6 +2358,7 @@ static void __devinit check_probe_mask(struct azx *chip, int dev) 
static struct snd_pci_quirk msi_black_list[] __devinitdata = {

	SND_PCI_QUIRK(0x1043, 0x81f2, "ASUS", 0), /* Athlon64 X2 + nvidia */

	SND_PCI_QUIRK(0x1043, 0x81f6, "ASUS", 0), /* nvidia */

	SND_PCI_QUIRK(0x1043, 0x822d, "ASUS", 0), /* Athlon64 X2 + nvidia MCP55 */

	SND_PCI_QUIRK(0x1849, 0x0888, "ASRock", 0), /* Athlon64 X2 + nvidia */

	{}

};

sound/pci/hda/patch_realtek.c

+7 −1
Original line number Diff line number Diff line
@@ -411,6 +411,8 @@ static int alc_mux_enum_info(struct snd_kcontrol *kcontrol, 
	unsigned int mux_idx = snd_ctl_get_ioffidx(kcontrol, &uinfo->id);

	if (mux_idx >= spec->num_mux_defs)

		mux_idx = 0;

	if (!spec->input_mux[mux_idx].num_items && mux_idx > 0)

		mux_idx = 0;

	return snd_hda_input_mux_info(&spec->input_mux[mux_idx], uinfo);

}










@@ -439,6 +441,8 @@ static int alc_mux_enum_put(struct snd_kcontrol *kcontrol,



























	mux_idx = adc_idx >= spec->num_mux_defs ? 0 : adc_idx;















	imux = &spec->input_mux[mux_idx];













	if (!imux->num_items && mux_idx > 0)













		imux = &spec->input_mux[0];





























	type = get_wcaps_type(get_wcaps(codec, nid));















	if (type == AC_WID_AUD_MIX) {










@@ -10105,6 +10109,8 @@ static void alc882_auto_init_input_src(struct hda_codec *codec)













			continue;















		mux_idx = c >= spec->num_mux_defs ? 0 : c;















		imux = &spec->input_mux[mux_idx];













		if (!imux->num_items && mux_idx > 0)













			imux = &spec->input_mux[0];















		for (idx = 0; idx < conns; idx++) {















			/* if the current connection is the selected one,















			 * unmute it as default - otherwise mute it










@@ -13201,7 +13207,7 @@ static int patch_alc268(struct hda_codec *codec)



























	if (board_config < 0 || board_config >= ALC268_MODEL_LAST)















		board_config = snd_hda_check_board_codec_sid_config(codec,













			ALC882_MODEL_LAST, alc268_models, alc268_ssid_cfg_tbl);













			ALC268_MODEL_LAST, alc268_models, alc268_ssid_cfg_tbl);





























	if (board_config < 0 || board_config >= ALC268_MODEL_LAST) {















		printk(KERN_INFO "hda_codec: %s: BIOS auto-probing.\n",