aboutsummaryrefslogtreecommitdiff
path: root/sound/hda
diff options
context:
space:
mode:
authorTakashi Iwai2015-07-27 14:43:29 +0200
committerTakashi Iwai2015-07-27 14:43:29 +0200
commit527c465a3c8716d93201ae34b7fc52679610596d (patch)
treee436b076df094caba9809b9c622374d396e84435 /sound/hda
parentfbce23a0b95763dfc4961ce6240e055c39f497ed (diff)
parent5ce000b297a1c1bb126a14b02acb40318b88a903 (diff)
Merge branch 'for-linus' into for-next
... to make easier developing HDA ext code.
Diffstat (limited to 'sound/hda')
-rw-r--r--sound/hda/hdac_i915.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/sound/hda/hdac_i915.c b/sound/hda/hdac_i915.c
index 442500e06b7c..5676b849379d 100644
--- a/sound/hda/hdac_i915.c
+++ b/sound/hda/hdac_i915.c
@@ -56,8 +56,11 @@ int snd_hdac_display_power(struct hdac_bus *bus, bool enable)
enable ? "enable" : "disable");
if (enable) {
- if (!bus->i915_power_refcount++)
+ if (!bus->i915_power_refcount++) {
acomp->ops->get_power(acomp->dev);
+ snd_hdac_set_codec_wakeup(bus, true);
+ snd_hdac_set_codec_wakeup(bus, false);
+ }
} else {
WARN_ON(!bus->i915_power_refcount);
if (!--bus->i915_power_refcount)