diff options
Diffstat (limited to 'sound/pci/hda/patch_ca0110.c')
-rw-r--r-- | sound/pci/hda/patch_ca0110.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/pci/hda/patch_ca0110.c b/sound/pci/hda/patch_ca0110.c index 09ccfabb4a17..19ae14f739cb 100644 --- a/sound/pci/hda/patch_ca0110.c +++ b/sound/pci/hda/patch_ca0110.c | |||
@@ -26,6 +26,7 @@ | |||
26 | #include <sound/core.h> | 26 | #include <sound/core.h> |
27 | #include "hda_codec.h" | 27 | #include "hda_codec.h" |
28 | #include "hda_local.h" | 28 | #include "hda_local.h" |
29 | #include "hda_auto_parser.h" | ||
29 | 30 | ||
30 | /* | 31 | /* |
31 | */ | 32 | */ |
@@ -341,8 +342,7 @@ static int ca0110_build_pcms(struct hda_codec *codec) | |||
341 | static void init_output(struct hda_codec *codec, hda_nid_t pin, hda_nid_t dac) | 342 | static void init_output(struct hda_codec *codec, hda_nid_t pin, hda_nid_t dac) |
342 | { | 343 | { |
343 | if (pin) { | 344 | if (pin) { |
344 | snd_hda_codec_write(codec, pin, 0, | 345 | snd_hda_set_pin_ctl(codec, pin, PIN_HP); |
345 | AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP); | ||
346 | if (get_wcaps(codec, pin) & AC_WCAP_OUT_AMP) | 346 | if (get_wcaps(codec, pin) & AC_WCAP_OUT_AMP) |
347 | snd_hda_codec_write(codec, pin, 0, | 347 | snd_hda_codec_write(codec, pin, 0, |
348 | AC_VERB_SET_AMP_GAIN_MUTE, | 348 | AC_VERB_SET_AMP_GAIN_MUTE, |
@@ -356,8 +356,8 @@ static void init_output(struct hda_codec *codec, hda_nid_t pin, hda_nid_t dac) | |||
356 | static void init_input(struct hda_codec *codec, hda_nid_t pin, hda_nid_t adc) | 356 | static void init_input(struct hda_codec *codec, hda_nid_t pin, hda_nid_t adc) |
357 | { | 357 | { |
358 | if (pin) { | 358 | if (pin) { |
359 | snd_hda_codec_write(codec, pin, 0, | 359 | snd_hda_set_pin_ctl(codec, pin, PIN_IN | |
360 | AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80); | 360 | snd_hda_get_default_vref(codec, pin)); |
361 | if (get_wcaps(codec, pin) & AC_WCAP_IN_AMP) | 361 | if (get_wcaps(codec, pin) & AC_WCAP_IN_AMP) |
362 | snd_hda_codec_write(codec, pin, 0, | 362 | snd_hda_codec_write(codec, pin, 0, |
363 | AC_VERB_SET_AMP_GAIN_MUTE, | 363 | AC_VERB_SET_AMP_GAIN_MUTE, |