Commit 77e314f7 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: hda/via - Add a few sanity checks 



Added sanity checks in a few places not to assume the pins having the
certain amp caps or the input-source being always assigned to a mux.

No actual bugs have been triggered by these, but surely better to be a
bit more robust.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 8d8bbc6f

sound/pci/hda/patch_via.c

+10 −1
Original line number Diff line number Diff line
@@ -550,7 +550,10 @@ static void via_auto_init_output(struct hda_codec *codec, 
	pin = path->path[path->depth - 1];



	init_output_pin(codec, pin, pin_type);

	if (get_wcaps(codec, pin) & AC_WCAP_OUT_AMP)

		caps = query_amp_caps(codec, pin, HDA_OUTPUT);

	else

		caps = 0;

	if (caps & AC_AMPCAP_MUTE) {

		unsigned int val;

		val = (caps & AC_AMPCAP_OFFSET) >> AC_AMPCAP_OFFSET_SHIFT;
@@ -645,6 +648,10 @@ static void via_auto_init_analog_input(struct hda_codec *codec) 


	/* init ADCs */

	for (i = 0; i < spec->num_adc_nids; i++) {

		hda_nid_t nid = spec->adc_nids[i];

		if (!(get_wcaps(codec, nid) & AC_WCAP_IN_AMP) ||

		    !(query_amp_caps(codec, nid, HDA_INPUT) & AC_AMPCAP_MUTE))

			continue;

		snd_hda_codec_write(codec, spec->adc_nids[i], 0,

				    AC_VERB_SET_AMP_GAIN_MUTE,

				    AMP_IN_UNMUTE(0));
@@ -1508,6 +1515,8 @@ static int via_build_controls(struct hda_codec *codec) 
	/* assign Capture Source enums to NID */

	kctl = snd_hda_find_mixer_ctl(codec, "Input Source");

	for (i = 0; kctl && i < kctl->count; i++) {

		if (!spec->mux_nids[i])

			continue;

		err = snd_hda_add_nid(codec, kctl, i, spec->mux_nids[i]);

		if (err < 0)

			return err;

CRA Git | Maintained and supported by SUSTech CRA and CCSE