Commit c0a20263 authored by Takashi Iwai's avatar Takashi Iwai

ALSA: hda - Fix initialization of hp pins with master_mute in Realtek

Some Reatlek model quirks use master_mute bool switch for controlling
the master-mute of outputs.  For these cases, the initialization of HP
pins/amps were forgotten during the transition to the common automute
helper function in 3.0 development time, and resulted in the muted HP
output as default.

This patch fixes the issue by adjusting the HP output explicitly with
master_mute switch.
Tested-by: default avatarMichal Hocko <mhocko@suse.cz>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 20f5e0b3
...@@ -1141,6 +1141,13 @@ static void update_speakers(struct hda_codec *codec) ...@@ -1141,6 +1141,13 @@ static void update_speakers(struct hda_codec *codec)
struct alc_spec *spec = codec->spec; struct alc_spec *spec = codec->spec;
int on; int on;
/* Control HP pins/amps depending on master_mute state;
* in general, HP pins/amps control should be enabled in all cases,
* but currently set only for master_mute, just to be safe
*/
do_automute(codec, ARRAY_SIZE(spec->autocfg.hp_pins),
spec->autocfg.hp_pins, spec->master_mute, true);
if (!spec->automute) if (!spec->automute)
on = 0; on = 0;
else else
...@@ -6201,11 +6208,6 @@ static const struct snd_kcontrol_new alc260_input_mixer[] = { ...@@ -6201,11 +6208,6 @@ static const struct snd_kcontrol_new alc260_input_mixer[] = {
/* update HP, line and mono out pins according to the master switch */ /* update HP, line and mono out pins according to the master switch */
static void alc260_hp_master_update(struct hda_codec *codec) static void alc260_hp_master_update(struct hda_codec *codec)
{ {
struct alc_spec *spec = codec->spec;
/* change HP pins */
do_automute(codec, ARRAY_SIZE(spec->autocfg.hp_pins),
spec->autocfg.hp_pins, spec->master_mute, true);
update_speakers(codec); update_speakers(codec);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment