diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-01-20 20:24:13 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-01-20 20:24:13 +0300 |
| commit | 2297bd6e526ce1469279284ffda9140f8d60ea84 (patch) | |
| tree | 569b8e25c2169e64f91f1a6a8c819420f5589a80 /sound/pci/hda/hda_codec.c | |
| parent | 41b5b01afb71226653282951965d5efa9d7b843d (diff) | |
| download | linux-2297bd6e526ce1469279284ffda9140f8d60ea84.tar.xz | |
ALSA: hda - Check HDMI jack types in the auto configuration
Add dig_out_type and dig_in_type fields to autocfg struct.
A proper HDA_PCM_TYPE_* value is assigned to these fields according
to the pin-jack location type value.
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 | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c index 0129e95672ae..dd419ce43d92 100644 --- a/sound/pci/hda/hda_codec.c +++ b/sound/pci/hda/hda_codec.c @@ -3392,10 +3392,18 @@ int snd_hda_parse_pin_def_config(struct hda_codec *codec, case AC_JACK_SPDIF_OUT: case AC_JACK_DIG_OTHER_OUT: cfg->dig_out_pin = nid; + if (loc == AC_JACK_LOC_HDMI) + cfg->dig_out_type = HDA_PCM_TYPE_HDMI; + else + cfg->dig_out_type = HDA_PCM_TYPE_SPDIF; break; case AC_JACK_SPDIF_IN: case AC_JACK_DIG_OTHER_IN: cfg->dig_in_pin = nid; + if (loc == AC_JACK_LOC_HDMI) + cfg->dig_in_type = HDA_PCM_TYPE_HDMI; + else + cfg->dig_in_type = HDA_PCM_TYPE_SPDIF; break; } } |