From 26d490ec65c7642dcab72abff7e44c205ff19657 Mon Sep 17 00:00:00 2001 From: Jerone Young Date: Tue, 3 Aug 2010 01:46:44 -0500 Subject: [PATCH] --- yaml --- r: 206486 b: refs/heads/master c: 68c18697910fdcacea36bd58d2d3d8febfa199a2 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/sound/pci/hda/patch_analog.c | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 25fada6f4e27..346d9754f063 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 607bc3e4888443cdd21a795f7312f64c2de26b5c +refs/heads/master: 68c18697910fdcacea36bd58d2d3d8febfa199a2 diff --git a/trunk/sound/pci/hda/patch_analog.c b/trunk/sound/pci/hda/patch_analog.c index afbe314a5bf3..b697fd2a6f8b 100644 --- a/trunk/sound/pci/hda/patch_analog.c +++ b/trunk/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;