diff options
| author |   Takashi Iwai <tiwai@suse.de> | 2015-07-27 14:43:29 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-07-27 14:43:29 +0200 |
| commit | 527c465a3c8716d93201ae34b7fc52679610596d (patch) | |
| tree | e436b076df094caba9809b9c622374d396e84435 /sound/hda | |
| parent | ALSA: hda - Check the return value from pm_runtime_get/put*() (diff) | |
| parent | ALSA: hda - Add pin quirk for the headset mic jack detection on Dell laptop (diff) | |
| download | linux-dev-527c465a3c8716d93201ae34b7fc52679610596d.tar.xz linux-dev-527c465a3c8716d93201ae34b7fc52679610596d.zip | |
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.c | 5 |
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) |