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

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

ALSA: hda - Improve auto-cfg mixer name for ALC880 



When there is only one DAC is used for ALC880, try to assign a better
name, either Speaker or Front, depending on the output pin type.

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

sound/pci/hda/patch_realtek.c

+8 −2
Original line number Original line Diff line number Diff line
@@ -4398,13 +4398,19 @@ static int alc880_auto_create_multi_out_ctls(struct alc_spec *spec, 
			if (err < 0)

			if (err < 0)

				return err;

				return err;

		} else {

		} else {

			sprintf(name, "%s Playback Volume", chname[i]);

			const char *pfx;

			if (cfg->line_outs == 1 &&

			    cfg->line_out_type == AUTO_PIN_SPEAKER_OUT)

				pfx = "Speaker";

			else

				pfx = chname[i];

			sprintf(name, "%s Playback Volume", pfx);

			err = add_control(spec, ALC_CTL_WIDGET_VOL, name,

			err = add_control(spec, ALC_CTL_WIDGET_VOL, name,

					  HDA_COMPOSE_AMP_VAL(nid, 3, 0,

					  HDA_COMPOSE_AMP_VAL(nid, 3, 0,

							      HDA_OUTPUT));

							      HDA_OUTPUT));

			if (err < 0)

			if (err < 0)

				return err;

				return err;

			sprintf(name, "%s Playback Switch", chname[i]);

			sprintf(name, "%s Playback Switch", pfx);

			err = add_control(spec, ALC_CTL_BIND_MUTE, name,

			err = add_control(spec, ALC_CTL_BIND_MUTE, name,

					  HDA_COMPOSE_AMP_VAL(nid, 3, 2,

					  HDA_COMPOSE_AMP_VAL(nid, 3, 2,

							      HDA_INPUT));

							      HDA_INPUT));