diff options
| author | Jerone Young <jerone.young@canonical.com> | 2010-08-03 01:46:44 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-08-03 08:57:47 +0200 |
| commit | 68c18697910fdcacea36bd58d2d3d8febfa199a2 (patch) | |
| tree | 9fa30256aff12b481f3937b8e6a9cfb18804eacb /sound/pci | |
| parent | 607bc3e4888443cdd21a795f7312f64c2de26b5c (diff) | |
| download | linux-3.10-68c18697910fdcacea36bd58d2d3d8febfa199a2.tar.gz linux-3.10-68c18697910fdcacea36bd58d2d3d8febfa199a2.tar.bz2 linux-3.10-68c18697910fdcacea36bd58d2d3d8febfa199a2.zip | |
ALSA: hda - Fix Thinkpad X300 so SPDIF is not exposed
Just as with the X301. The X300 does not have a way to do SPDIF either.
It does not have a dock connector, nor does it have the SPDIF through
the headphone jack.
This patch fixes it so X300 does not show SPDIF, since it cannot do it.
To add all Lenovo Thinkpads had different codec subsytem IDs:
X300:
http://launchpadlibrarian.net/34862838/Card0.Codecs.codec.0.txt
Signed-off-by: Jerone Young <jerone.young@canonical.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci')
| -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 afbe314a5bf..b697fd2a6f8 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; |