This is a note to let you know that I've just added the patch titled
ALSA: hda - Fix unbalanced runtime PM refcount after S3/S4
to the 3.10-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
alsa-hda-fix-unbalanced-runtime-pm-refcount-after-s3-s4.patch
and it can be found in the queue-3.10 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From e6bbe666673ab044a3d39ddb74e4d9a401cf1d6f Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@xxxxxxx>
Date: Thu, 24 Oct 2013 01:20:24 +0200
Subject: ALSA: hda - Fix unbalanced runtime PM refcount after S3/S4
From: Takashi Iwai <tiwai@xxxxxxx>
commit e6bbe666673ab044a3d39ddb74e4d9a401cf1d6f upstream.
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.
Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
sound/pci/hda/hda_codec.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- a/sound/pci/hda/hda_codec.c
+++ b/sound/pci/hda/hda_codec.c
@@ -4789,8 +4789,8 @@ static void hda_power_work(struct work_s
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);
}
Patches currently in stable-queue which might be from tiwai@xxxxxxx are
queue-3.10/alsa-hda-fix-unbalanced-runtime-pm-refcount-after-s3-s4.patch
queue-3.10/asoc-wm_hubs-add-missing-break-in-hp_supply_event.patch
queue-3.10/alsa-fix-oops-in-snd_pcm_info-caused-by-asoc-dpcm.patch
queue-3.10/alsa-hda-add-a-fixup-for-asus-n76vz.patch
queue-3.10/asoc-dapm-fix-source-list-debugfs-outputs.patch
queue-3.10/alsa-hda-add-missing-initial-vmaster-hook-at-build_controls-callback.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html