diff options
author | Anders Roxell <anders.roxell@linaro.org> | 2013-11-25 13:14:58 +0100 |
---|---|---|
committer | Anders Roxell <anders.roxell@linaro.org> | 2013-11-25 13:14:58 +0100 |
commit | 4fcea1cf4c9da385a2fa90dc631ff453bbfdbcb1 (patch) | |
tree | db2b279c1ef40e8170883efd1c0bd118d1803aec /sound/pci/hda/hda_codec.c | |
parent | b153532021104be5cc1abc3b6b60c004739b31c7 (diff) | |
parent | 3729ed7c6aa8c5b9eee8f832e4a246b8fa1d56b5 (diff) |
Merge tag 'v3.10.19' into linux-lnglinux-lng-v3.10.19-final
This is the 3.10.19 stable release
Diffstat (limited to 'sound/pci/hda/hda_codec.c')
-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 55108b5fb291..31461ba32d3c 100644 --- 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_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); } |