aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/hda/hda_codec.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2007-04-23 11:16:21 -0400
committerJaroslav Kysela <perex@suse.cz>2007-05-11 10:56:09 -0400
commitd258e24a39a75834f25c39f90a3a429978e9b896 (patch)
tree93f5329faa03a77762b95c6e7e4508c714a5d06f /sound/pci/hda/hda_codec.c
parent658fba0efe93fdef44f65cff391ae2a881e30d90 (diff)
[ALSA] hda-codec - Add line_out_type to auto_pin_cfg struct
Added line_out_type field to auto_pin_cfg struct to provide the pin type of default line_outs. Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Diffstat (limited to 'sound/pci/hda/hda_codec.c')
-rw-r--r--sound/pci/hda/hda_codec.c2
1 files changed, 2 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