aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/hda/patch_realtek.c
diff options
context:
space:
mode:
Diffstat (limited to 'sound/pci/hda/patch_realtek.c')
-rw-r--r--sound/pci/hda/patch_realtek.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index 6b1a5de07e35..ac00420e59ff 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -40,9 +40,6 @@
40/* keep halting ALC5505 DSP, for power saving */ 40/* keep halting ALC5505 DSP, for power saving */
41#define HALT_REALTEK_ALC5505 41#define HALT_REALTEK_ALC5505
42 42
43/* unsol event tags */
44#define ALC_DCVOL_EVENT 0x08
45
46/* for GPIO Poll */ 43/* for GPIO Poll */
47#define GPIO_MASK 0x03 44#define GPIO_MASK 0x03
48 45
@@ -1130,7 +1127,8 @@ static void alc880_fixup_vol_knob(struct hda_codec *codec,
1130 const struct hda_fixup *fix, int action) 1127 const struct hda_fixup *fix, int action)
1131{ 1128{
1132 if (action == HDA_FIXUP_ACT_PROBE) 1129 if (action == HDA_FIXUP_ACT_PROBE)
1133 snd_hda_jack_detect_enable_callback(codec, 0x21, ALC_DCVOL_EVENT, alc_update_knob_master); 1130 snd_hda_jack_detect_enable_callback(codec, 0x21,
1131 alc_update_knob_master);
1134} 1132}
1135 1133
1136static const struct hda_fixup alc880_fixups[] = { 1134static const struct hda_fixup alc880_fixups[] = {
@@ -1593,7 +1591,7 @@ static void alc260_fixup_gpio1_toggle(struct hda_codec *codec,
1593 spec->gen.detect_hp = 1; 1591 spec->gen.detect_hp = 1;
1594 spec->gen.automute_speaker = 1; 1592 spec->gen.automute_speaker = 1;
1595 spec->gen.autocfg.hp_pins[0] = 0x0f; /* copy it for automute */ 1593 spec->gen.autocfg.hp_pins[0] = 0x0f; /* copy it for automute */
1596 snd_hda_jack_detect_enable_callback(codec, 0x0f, HDA_GEN_HP_EVENT, 1594 snd_hda_jack_detect_enable_callback(codec, 0x0f,
1597 snd_hda_gen_hp_automute); 1595 snd_hda_gen_hp_automute);
1598 snd_hda_add_verbs(codec, alc_gpio1_init_verbs); 1596 snd_hda_add_verbs(codec, alc_gpio1_init_verbs);
1599 } 1597 }
@@ -4254,7 +4252,6 @@ static void alc282_fixup_asus_tx300(struct hda_codec *codec,
4254 spec->gen.auto_mute_via_amp = 1; 4252 spec->gen.auto_mute_via_amp = 1;
4255 spec->gen.automute_hook = asus_tx300_automute; 4253 spec->gen.automute_hook = asus_tx300_automute;
4256 snd_hda_jack_detect_enable_callback(codec, 0x1b, 4254 snd_hda_jack_detect_enable_callback(codec, 0x1b,
4257 HDA_GEN_HP_EVENT,
4258 snd_hda_gen_hp_automute); 4255 snd_hda_gen_hp_automute);
4259 break; 4256 break;
4260 case HDA_FIXUP_ACT_BUILD: 4257 case HDA_FIXUP_ACT_BUILD: