From 2e091a67fff412e01e03ff779e76267f395d2d05 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Fri, 10 Jun 2011 14:37:04 +0200 Subject: [PATCH] --- yaml --- r: 257654 b: refs/heads/master c: 695cd4a34e4e02486e35d3c8e0ee85581a619357 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/sound/pci/hda/patch_analog.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index ad5fc38e1483..ede627b2bce1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b4a655e81d4d1d12abc92d29dfb7550e66a08799 +refs/heads/master: 695cd4a34e4e02486e35d3c8e0ee85581a619357 diff --git a/trunk/sound/pci/hda/patch_analog.c b/trunk/sound/pci/hda/patch_analog.c index 0f7b8951440f..1362c8ba4d1f 100644 --- a/trunk/sound/pci/hda/patch_analog.c +++ b/trunk/sound/pci/hda/patch_analog.c @@ -1922,7 +1922,8 @@ static int patch_ad1981(struct hda_codec *codec) spec->mixers[0] = ad1981_hp_mixers; spec->num_init_verbs = 2; spec->init_verbs[1] = ad1981_hp_init_verbs; - spec->multiout.dig_out_nid = 0; + if (!is_jack_available(codec, 0x0a)) + spec->multiout.dig_out_nid = 0; spec->input_mux = &ad1981_hp_capture_source; codec->patch_ops.init = ad1981_hp_init;