diff options
| author |   Takashi Iwai <tiwai@suse.de> | 2005-11-17 11:09:23 +0100 |
|---|---|---|
| committer |   Jaroslav Kysela <perex@suse.cz> | 2006-01-03 12:17:26 +0100 |
| commit | 8d88bc3d361bdd81a214eb9c5d06b291d06c603a (patch) | |
| tree | dc3bfd15ff731e55bc8c2e29f54d050325a9ee1a /sound/pci/hda/hda_codec.c | |
| parent | [ALSA] hda-codec - Fix a typo (diff) | |
| download | linux-dev-8d88bc3d361bdd81a214eb9c5d06b291d06c603a.tar.xz linux-dev-8d88bc3d361bdd81a214eb9c5d06b291d06c603a.zip | |
[ALSA] hda-codec - Fix assignment of speaker pin
Modules: HDA Codec driver,HDA generic driver
Fix the auto-assignment of speaker pin. Handle it independently from
line-out pins.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/hda/hda_codec.c')
| -rw-r--r-- | sound/pci/hda/hda_codec.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c index cfd50b56187b..2e9f5877386e 100644 --- a/sound/pci/hda/hda_codec.c +++ b/sound/pci/hda/hda_codec.c @@ -1889,7 +1889,6 @@ int snd_hda_parse_pin_def_config(struct hda_codec *codec, struct auto_pin_cfg *c loc = get_defcfg_location(def_conf); switch (get_defcfg_device(def_conf)) { case AC_JACK_LINE_OUT: - case AC_JACK_SPEAKER: seq = get_defcfg_sequence(def_conf); assoc = get_defcfg_association(def_conf); if (! assoc) @@ -1904,6 +1903,9 @@ int snd_hda_parse_pin_def_config(struct hda_codec *codec, struct auto_pin_cfg *c sequences[cfg->line_outs] = seq; cfg->line_outs++; break; + case AC_JACK_SPEAKER: + cfg->speaker_pin = nid; + break; case AC_JACK_HP_OUT: cfg->hp_pin = nid; break; |