diff options
-rw-r--r-- | sound/pci/hda/hda_codec.c | 2 | ||||
-rw-r--r-- | sound/pci/hda/hda_local.h | 7 |
2 files changed, 9 insertions, 0 deletions
diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c index a58fdf4cbe5c..9c8ac157791f 100644 --- a/sound/pci/hda/hda_codec.c +++ b/sound/pci/hda/hda_codec.c | |||
@@ -2288,12 +2288,14 @@ int __devinit snd_hda_parse_pin_def_config(struct hda_codec *codec, | |||
2288 | sizeof(cfg->speaker_pins)); | 2288 | sizeof(cfg->speaker_pins)); |
2289 | cfg->speaker_outs = 0; | 2289 | cfg->speaker_outs = 0; |
2290 | memset(cfg->speaker_pins, 0, sizeof(cfg->speaker_pins)); | 2290 | memset(cfg->speaker_pins, 0, sizeof(cfg->speaker_pins)); |
2291 | cfg->line_out_type = AUTO_PIN_SPEAKER_OUT; | ||
2291 | } else if (cfg->hp_outs) { | 2292 | } else if (cfg->hp_outs) { |
2292 | cfg->line_outs = cfg->hp_outs; | 2293 | cfg->line_outs = cfg->hp_outs; |
2293 | memcpy(cfg->line_out_pins, cfg->hp_pins, | 2294 | memcpy(cfg->line_out_pins, cfg->hp_pins, |
2294 | sizeof(cfg->hp_pins)); | 2295 | sizeof(cfg->hp_pins)); |
2295 | cfg->hp_outs = 0; | 2296 | cfg->hp_outs = 0; |
2296 | memset(cfg->hp_pins, 0, sizeof(cfg->hp_pins)); | 2297 | memset(cfg->hp_pins, 0, sizeof(cfg->hp_pins)); |
2298 | cfg->line_out_type = AUTO_PIN_HP_OUT; | ||
2297 | } | 2299 | } |
2298 | } | 2300 | } |
2299 | 2301 | ||
diff --git a/sound/pci/hda/hda_local.h b/sound/pci/hda/hda_local.h index 3505a670995f..be12b8814c39 100644 --- a/sound/pci/hda/hda_local.h +++ b/sound/pci/hda/hda_local.h | |||
@@ -222,6 +222,12 @@ enum { | |||
222 | AUTO_PIN_LAST | 222 | AUTO_PIN_LAST |
223 | }; | 223 | }; |
224 | 224 | ||
225 | enum { | ||
226 | AUTO_PIN_LINE_OUT, | ||
227 | AUTO_PIN_SPEAKER_OUT, | ||
228 | AUTO_PIN_HP_OUT | ||
229 | }; | ||
230 | |||
225 | extern const char *auto_pin_cfg_labels[AUTO_PIN_LAST]; | 231 | extern const char *auto_pin_cfg_labels[AUTO_PIN_LAST]; |
226 | 232 | ||
227 | struct auto_pin_cfg { | 233 | struct auto_pin_cfg { |
@@ -230,6 +236,7 @@ struct auto_pin_cfg { | |||
230 | int speaker_outs; | 236 | int speaker_outs; |
231 | hda_nid_t speaker_pins[5]; | 237 | hda_nid_t speaker_pins[5]; |
232 | int hp_outs; | 238 | int hp_outs; |
239 | int line_out_type; /* AUTO_PIN_XXX_OUT */ | ||
233 | hda_nid_t hp_pins[5]; | 240 | hda_nid_t hp_pins[5]; |
234 | hda_nid_t input_pins[AUTO_PIN_LAST]; | 241 | hda_nid_t input_pins[AUTO_PIN_LAST]; |
235 | hda_nid_t dig_out_pin; | 242 | hda_nid_t dig_out_pin; |