|
@@ -1141,6 +1141,13 @@ static void update_speakers(struct hda_codec *codec)
|
|
|
struct alc_spec *spec = codec->spec;
|
|
|
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)
|
|
|
on = 0;
|
|
|
else
|
|
@@ -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 */
|
|
|
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);
|
|
|
}
|
|
|
|