diff options
| author | Takashi Iwai <tiwai@suse.de> | 2013-10-24 01:20:24 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2013-10-24 09:21:45 +0200 |
| commit | e6bbe666673ab044a3d39ddb74e4d9a401cf1d6f (patch) | |
| tree | e1c681dfe1d213c2d8833dcf7290832d654faebf /sound/pci | |
| parent | d7f8761b6614d2d3695dd57d27d0b2f952777648 (diff) | |
| download | op-kernel-dev-e6bbe666673ab044a3d39ddb74e4d9a401cf1d6f.zip op-kernel-dev-e6bbe666673ab044a3d39ddb74e4d9a401cf1d6f.tar.gz | |
ALSA: hda - Fix unbalanced runtime PM refcount after S3/S4
When a machine goes to S3/S4 after power-save is enabled, the runtime
PM refcount might be incorrectly decreased because the power-down
triggered soon after resume assumes that the controller was already
powered up, and issues the pm_notify down.
This patch fixes the incorrect pm_notify call simply by checking the
current value properly.
Cc: <stable@vger.kernel.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci')
| -rw-r--r-- | sound/pci/hda/hda_codec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c index 5b6c4e3..748c6a9 100644 --- a/sound/pci/hda/hda_codec.c +++ b/sound/pci/hda/hda_codec.c @@ -4864,8 +4864,8 @@ static void hda_power_work(struct work_struct *work) spin_unlock(&codec->power_lock); state = hda_call_codec_suspend(codec, true); - codec->pm_down_notified = 0; - if (!bus->power_keep_link_on && (state & AC_PWRST_CLK_STOP_OK)) { + if (!codec->pm_down_notified && + !bus->power_keep_link_on && (state & AC_PWRST_CLK_STOP_OK)) { codec->pm_down_notified = 1; hda_call_pm_notify(bus, false); } |
