[PATCH 3/3] Revert "ALSA: hda/realtek - Fix lose hp_pins for disable auto mute"
Chris Wilson
chris at chris-wilson.co.uk
Mon Feb 4 09:11:41 UTC 2019
This reverts commit d561aa0a70bb2e1dd85fde98b6a5561e4175ac3e.
---
sound/pci/hda/patch_realtek.c | 45 -----------------------------------
1 file changed, 45 deletions(-)
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index 04b1e2900035..74577c8e5e3b 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -2963,11 +2963,6 @@ static void alc282_init(struct hda_codec *codec)
bool hp_pin_sense;
int coef78;
- if (!spec->gen.autocfg.hp_outs && spec->gen.suppress_auto_mute) {
- if (spec->gen.autocfg.line_out_type == AC_JACK_HP_OUT)
- hp_pin = spec->gen.autocfg.line_out_pins[0];
- }
-
alc282_restore_default_value(codec);
if (!hp_pin)
@@ -3005,11 +3000,6 @@ static void alc282_shutup(struct hda_codec *codec)
bool hp_pin_sense;
int coef78;
- if (!spec->gen.autocfg.hp_outs && spec->gen.suppress_auto_mute) {
- if (spec->gen.autocfg.line_out_type == AC_JACK_HP_OUT)
- hp_pin = spec->gen.autocfg.line_out_pins[0];
- }
-
if (!hp_pin) {
alc269_shutup(codec);
return;
@@ -3169,11 +3159,6 @@ static void alc256_init(struct hda_codec *codec)
hda_nid_t hp_pin = spec->gen.autocfg.hp_pins[0];
bool hp_pin_sense;
- if (!spec->gen.autocfg.hp_outs && spec->gen.suppress_auto_mute) {
- if (spec->gen.autocfg.line_out_type == AC_JACK_HP_OUT)
- hp_pin = spec->gen.autocfg.line_out_pins[0];
- }
-
if (!hp_pin)
return;
@@ -3210,11 +3195,6 @@ static void alc256_shutup(struct hda_codec *codec)
hda_nid_t hp_pin = spec->gen.autocfg.hp_pins[0];
bool hp_pin_sense;
- if (!spec->gen.autocfg.hp_outs && spec->gen.suppress_auto_mute) {
- if (spec->gen.autocfg.line_out_type == AC_JACK_HP_OUT)
- hp_pin = spec->gen.autocfg.line_out_pins[0];
- }
-
if (!hp_pin) {
alc269_shutup(codec);
return;
@@ -3251,11 +3231,6 @@ static void alc225_init(struct hda_codec *codec)
hda_nid_t hp_pin = spec->gen.autocfg.hp_pins[0];
bool hp1_pin_sense, hp2_pin_sense;
- if (!spec->gen.autocfg.hp_outs && spec->gen.suppress_auto_mute) {
- if (spec->gen.autocfg.line_out_type == AC_JACK_HP_OUT)
- hp_pin = spec->gen.autocfg.line_out_pins[0];
- }
-
if (!hp_pin)
return;
@@ -3299,11 +3274,6 @@ static void alc225_shutup(struct hda_codec *codec)
hda_nid_t hp_pin = spec->gen.autocfg.hp_pins[0];
bool hp1_pin_sense, hp2_pin_sense;
- if (!spec->gen.autocfg.hp_outs && spec->gen.suppress_auto_mute) {
- if (spec->gen.autocfg.line_out_type == AC_JACK_HP_OUT)
- hp_pin = spec->gen.autocfg.line_out_pins[0];
- }
-
if (!hp_pin) {
alc269_shutup(codec);
return;
@@ -3348,11 +3318,6 @@ static void alc_default_init(struct hda_codec *codec)
hda_nid_t hp_pin = spec->gen.autocfg.hp_pins[0];
bool hp_pin_sense;
- if (!spec->gen.autocfg.hp_outs && spec->gen.suppress_auto_mute) {
- if (spec->gen.autocfg.line_out_type == AC_JACK_HP_OUT)
- hp_pin = spec->gen.autocfg.line_out_pins[0];
- }
-
if (!hp_pin)
return;
@@ -3382,11 +3347,6 @@ static void alc_default_shutup(struct hda_codec *codec)
hda_nid_t hp_pin = spec->gen.autocfg.hp_pins[0];
bool hp_pin_sense;
- if (!spec->gen.autocfg.hp_outs && spec->gen.suppress_auto_mute) {
- if (spec->gen.autocfg.line_out_type == AC_JACK_HP_OUT)
- hp_pin = spec->gen.autocfg.line_out_pins[0];
- }
-
if (!hp_pin) {
alc269_shutup(codec);
return;
@@ -3419,11 +3379,6 @@ static void alc294_hp_init(struct hda_codec *codec)
hda_nid_t hp_pin = spec->gen.autocfg.hp_pins[0];
int i, val;
- if (!spec->gen.autocfg.hp_outs && spec->gen.suppress_auto_mute) {
- if (spec->gen.autocfg.line_out_type == AC_JACK_HP_OUT)
- hp_pin = spec->gen.autocfg.line_out_pins[0];
- }
-
if (!hp_pin)
return;
--
2.20.1
More information about the Intel-gfx-trybot
mailing list