From 7b16f73a3c8541f7684ed31d8171382a4ac4c3d8 Mon Sep 17 00:00:00 2001 From: David Henningsson Date: Tue, 5 Feb 2013 12:06:03 +0100 Subject: [PATCH] --- yaml --- r: 353233 b: refs/heads/master c: 05dc0fc9d01537a66d9a0cffe2e96296d8f4c7ac h: refs/heads/master i: 353231: ed1da83bccfc01acb985e818a2365cfebc190292 v: v3 --- [refs] | 2 +- trunk/sound/pci/hda/patch_via.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 2f5e2a059d60..06d4bc064431 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f672f65a1c15b04e09d25701a8b5be47bad9376a +refs/heads/master: 05dc0fc9d01537a66d9a0cffe2e96296d8f4c7ac diff --git a/trunk/sound/pci/hda/patch_via.c b/trunk/sound/pci/hda/patch_via.c index e934c498b95d..ca7d962a08a6 100644 --- a/trunk/sound/pci/hda/patch_via.c +++ b/trunk/sound/pci/hda/patch_via.c @@ -217,8 +217,7 @@ static void vt1708_update_hp_work(struct hda_codec *codec) struct via_spec *spec = codec->spec; if (spec->codec_type != VT1708 || !spec->gen.autocfg.hp_outs) return; - if (spec->vt1708_jack_detect && - (spec->gen.active_streams || hp_detect_with_aa(codec))) { + if (spec->vt1708_jack_detect) { if (!spec->hp_work_active) { codec->jackpoll_interval = msecs_to_jiffies(100); snd_hda_codec_write(codec, 0x1, 0, 0xf81, 0);