From 283aa17c519a03884fd67e803350c5d1903f6ace Mon Sep 17 00:00:00 2001 From: "Zhang, Rui" Date: Wed, 24 Feb 2010 09:38:49 +0800 Subject: [PATCH] --- yaml --- r: 182769 b: refs/heads/master c: dd2b4a7abf82d88261f8f98e1361388a7db2ffe4 h: refs/heads/master i: 182767: 8a2458f9ff48a52569dd9f8a6d093b6cb0869eda v: v3 --- [refs] | 2 +- trunk/sound/pci/hda/hda_codec.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 2737e3a6d1b7..e87a3828b495 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0d7d8bf3b896dd8752284e2a7639a03936085e5f +refs/heads/master: dd2b4a7abf82d88261f8f98e1361388a7db2ffe4 diff --git a/trunk/sound/pci/hda/hda_codec.c b/trunk/sound/pci/hda/hda_codec.c index 98767df4f03a..76d3c4c049db 100644 --- a/trunk/sound/pci/hda/hda_codec.c +++ b/trunk/sound/pci/hda/hda_codec.c @@ -2767,7 +2767,8 @@ static void hda_set_power_state(struct hda_codec *codec, hda_nid_t fg, snd_hda_codec_read(codec, fg, 0, AC_VERB_SET_POWER_STATE, power_state); /* partial workaround for "azx_get_response timeout" */ - if (power_state == AC_PWRST_D0) + if (power_state == AC_PWRST_D0 && + (codec->vendor_id & 0xffff0000) == 0x14f10000) msleep(10); nid = codec->start_nid; @@ -2801,7 +2802,6 @@ static void hda_set_power_state(struct hda_codec *codec, hda_nid_t fg, if (power_state == AC_PWRST_D0) { unsigned long end_time; int state; - msleep(10); /* wait until the codec reachs to D0 */ end_time = jiffies + msecs_to_jiffies(500); do {