diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-07-24 12:50:19 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-07-24 12:50:19 -0700 |
| commit | 5b7f00a5967a3fdd8654ba6926930e672710ef63 (patch) | |
| tree | ec53b0119f78a4c3e2d9d77a4156ef4288d0e9ac /sound/hda/hdac_i915.c | |
| parent | 874bf9ee69cdebc1e734a391d6b2fa3e08c9ff87 (diff) | |
| parent | cba59972a1191a0c1647a52fe745eed7a4b34b38 (diff) | |
| download | linux-stable-5b7f00a5967a3fdd8654ba6926930e672710ef63.tar.gz linux-stable-5b7f00a5967a3fdd8654ba6926930e672710ef63.tar.bz2 linux-stable-5b7f00a5967a3fdd8654ba6926930e672710ef63.zip | |
Merge tag 'sound-4.2-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
Pull sound fixes from Takashi Iwai:
"This has been a calm week again: one minor lockdep fix for PCM core,
and the most of the rest are HD-audio quirks and fixups for various
chips and machines"
* tag 'sound-4.2-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
ALSA: hda - Add headset mic pin quirk for a Dell device
ALSA: hda - remove one pin from ALC292_STANDARD_PINS
ALSA: hda - Add new GPU codec ID 0x10de007d to snd-hda
ALSA: hda: add new AMD PCI IDs with proper driver caps
ALSA: hda - Fix Skylake codec timeout
ALSA: hda - Add headset mic support for Acer Aspire V5-573G
ALSA: sparc: Add missing kfree in error path
ALSA: pcm: Fix lockdep warning with nonatomic PCM ops
Diffstat (limited to 'sound/hda/hdac_i915.c')
| -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) |