diff options
| author | Linus Torvalds | 2010-07-30 00:21:07 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2010-07-30 00:21:07 +0200 |
| commit | e271e872a8685be8e13fe006f0d81630f65d7e5c (patch) | |
| tree | d1a671f411a8e8cbbada2db46efafb0b5e3fe10e /sound/pci/hda/patch_nvhdmi.c | |
| parent | CRED: Fix __task_cred()'s lockdep check and banner comment (diff) | |
| parent | ALSA: hda - Add a PC-beep workaround for ASUS P5-V (diff) | |
| download | kernel-qcow2-linux-e271e872a8685be8e13fe006f0d81630f65d7e5c.tar.gz kernel-qcow2-linux-e271e872a8685be8e13fe006f0d81630f65d7e5c.tar.xz kernel-qcow2-linux-e271e872a8685be8e13fe006f0d81630f65d7e5c.zip | |
Merge branch 'fix/hda' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
* 'fix/hda' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
ALSA: hda - Add a PC-beep workaround for ASUS P5-V
ALSA: hda - Assume PC-beep as default for Realtek
ALSA: hda - Don't register beep input device when no beep is available
ALSA: hda - Fix pin-detection of Nvidia HDMI
Diffstat (limited to 'sound/pci/hda/patch_nvhdmi.c')
| -rw-r--r-- | sound/pci/hda/patch_nvhdmi.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sound/pci/hda/patch_nvhdmi.c b/sound/pci/hda/patch_nvhdmi.c index 3c10c0b149f4..b0652acee9b2 100644 --- a/sound/pci/hda/patch_nvhdmi.c +++ b/sound/pci/hda/patch_nvhdmi.c @@ -478,6 +478,7 @@ static int patch_nvhdmi_8ch_89(struct hda_codec *codec) codec->spec = spec; spec->codec_type = HDA_CODEC_NVIDIA_MCP89; + spec->old_pin_detect = 1; if (hdmi_parse_codec(codec) < 0) { codec->spec = NULL; @@ -508,6 +509,7 @@ static int patch_nvhdmi_8ch_7x(struct hda_codec *codec) spec->multiout.max_channels = 8; spec->multiout.dig_out_nid = nvhdmi_master_con_nid_7x; spec->codec_type = HDA_CODEC_NVIDIA_MCP7X; + spec->old_pin_detect = 1; codec->patch_ops = nvhdmi_patch_ops_8ch_7x; @@ -528,6 +530,7 @@ static int patch_nvhdmi_2ch(struct hda_codec *codec) spec->multiout.max_channels = 2; spec->multiout.dig_out_nid = nvhdmi_master_con_nid_7x; spec->codec_type = HDA_CODEC_NVIDIA_MCP7X; + spec->old_pin_detect = 1; codec->patch_ops = nvhdmi_patch_ops_2ch; |