diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-08-05 11:16:56 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-08-05 11:16:56 +0200 |
| commit | 2603798070a80d76e7e6d2992ba4ec74addcec90 (patch) | |
| tree | 7a1cdc33bd9bbf3807db239205de02d6beb58e30 /sound/pci/hda/patch_analog.c | |
| parent | 9fe6206f400646a2322096b56c59891d530e8d51 (diff) | |
| parent | fc091769a5aa65c045bfbda149c424ba33d0abbb (diff) | |
| download | op-kernel-dev-2603798070a80d76e7e6d2992ba4ec74addcec90.zip op-kernel-dev-2603798070a80d76e7e6d2992ba4ec74addcec90.tar.gz | |
Merge branch 'topic/hda' into for-linus
Diffstat (limited to 'sound/pci/hda/patch_analog.c')
| -rw-r--r-- | sound/pci/hda/patch_analog.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/sound/pci/hda/patch_analog.c b/sound/pci/hda/patch_analog.c index afbe314..b697fd2 100644 --- a/sound/pci/hda/patch_analog.c +++ b/sound/pci/hda/patch_analog.c @@ -3662,7 +3662,12 @@ static int patch_ad1984(struct hda_codec *codec) codec->patch_ops.build_pcms = ad1984_build_pcms; break; case AD1984_THINKPAD: - spec->multiout.dig_out_nid = AD1884_SPDIF_OUT; + if (codec->subsystem_id == 0x17aa20fb) { + /* Thinpad X300 does not have the ability to do SPDIF, + or attach to docking station to use SPDIF */ + spec->multiout.dig_out_nid = 0; + } else + spec->multiout.dig_out_nid = AD1884_SPDIF_OUT; spec->input_mux = &ad1984_thinkpad_capture_source; spec->mixers[0] = ad1984_thinkpad_mixers; spec->init_verbs[spec->num_init_verbs++] = ad1984_thinkpad_init_verbs; |
