diff options
Diffstat (limited to 'sound/pci/hda/patch_ca0132.c')
-rw-r--r-- | sound/pci/hda/patch_ca0132.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/sound/pci/hda/patch_ca0132.c b/sound/pci/hda/patch_ca0132.c index 21d91d580da8..d0d3540e39e7 100644 --- a/sound/pci/hda/patch_ca0132.c +++ b/sound/pci/hda/patch_ca0132.c | |||
@@ -30,6 +30,7 @@ | |||
30 | #include <sound/core.h> | 30 | #include <sound/core.h> |
31 | #include "hda_codec.h" | 31 | #include "hda_codec.h" |
32 | #include "hda_local.h" | 32 | #include "hda_local.h" |
33 | #include "hda_auto_parser.h" | ||
33 | 34 | ||
34 | #define WIDGET_CHIP_CTRL 0x15 | 35 | #define WIDGET_CHIP_CTRL 0x15 |
35 | #define WIDGET_DSP_CTRL 0x16 | 36 | #define WIDGET_DSP_CTRL 0x16 |
@@ -239,8 +240,7 @@ enum get_set { | |||
239 | static void init_output(struct hda_codec *codec, hda_nid_t pin, hda_nid_t dac) | 240 | static void init_output(struct hda_codec *codec, hda_nid_t pin, hda_nid_t dac) |
240 | { | 241 | { |
241 | if (pin) { | 242 | if (pin) { |
242 | snd_hda_codec_write(codec, pin, 0, | 243 | snd_hda_set_pin_ctl(codec, pin, PIN_HP); |
243 | AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP); | ||
244 | if (get_wcaps(codec, pin) & AC_WCAP_OUT_AMP) | 244 | if (get_wcaps(codec, pin) & AC_WCAP_OUT_AMP) |
245 | snd_hda_codec_write(codec, pin, 0, | 245 | snd_hda_codec_write(codec, pin, 0, |
246 | AC_VERB_SET_AMP_GAIN_MUTE, | 246 | AC_VERB_SET_AMP_GAIN_MUTE, |
@@ -254,9 +254,8 @@ static void init_output(struct hda_codec *codec, hda_nid_t pin, hda_nid_t dac) | |||
254 | static void init_input(struct hda_codec *codec, hda_nid_t pin, hda_nid_t adc) | 254 | static void init_input(struct hda_codec *codec, hda_nid_t pin, hda_nid_t adc) |
255 | { | 255 | { |
256 | if (pin) { | 256 | if (pin) { |
257 | snd_hda_codec_write(codec, pin, 0, | 257 | snd_hda_set_pin_ctl(codec, pin, PIN_IN | |
258 | AC_VERB_SET_PIN_WIDGET_CONTROL, | 258 | snd_hda_get_default_vref(codec, pin)); |
259 | PIN_VREF80); | ||
260 | if (get_wcaps(codec, pin) & AC_WCAP_IN_AMP) | 259 | if (get_wcaps(codec, pin) & AC_WCAP_IN_AMP) |
261 | snd_hda_codec_write(codec, pin, 0, | 260 | snd_hda_codec_write(codec, pin, 0, |
262 | AC_VERB_SET_AMP_GAIN_MUTE, | 261 | AC_VERB_SET_AMP_GAIN_MUTE, |