summaryrefslogtreecommitdiffstats
path: root/drivers/acpi
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-06-10 01:32:38 +0200
committerSasha Levin <sasha.levin@oracle.com>2015-07-03 23:02:26 -0400
commit45a66d0b9e686d1e3d0c36ab8fd69fe589303d2f (patch)
tree51c0cfe4a7feb7cb984ffff42c207317950cd2f7 /drivers/acpi
parent41a2fe6bbea1d240abfd436a515457b9f293360d (diff)
downloadlinux-stable-45a66d0b9e686d1e3d0c36ab8fd69fe589303d2f.tar.gz
linux-stable-45a66d0b9e686d1e3d0c36ab8fd69fe589303d2f.tar.bz2
linux-stable-45a66d0b9e686d1e3d0c36ab8fd69fe589303d2f.zip
ACPI / PM: Add missing pm_generic_complete() invocation
[ Upstream commit 3d56402d3fa8d10749eeb36293dd1992bd5ad0c3 ] Add missing invocation of pm_generic_complete() to acpi_subsys_complete() to allow ->complete callbacks provided by the drivers of devices using the ACPI PM domain to be executed during system resume. Fixes: f25c0ae2b4c4 (ACPI / PM: Avoid resuming devices in ACPI PM domain during system suspend) Cc: 3.16+ <stable@vger.kernel.org> # 3.16+ Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Diffstat (limited to 'drivers/acpi')
-rw-r--r--drivers/acpi/device_pm.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/acpi/device_pm.c b/drivers/acpi/device_pm.c
index 6341e668f362..813397a25594 100644
--- a/drivers/acpi/device_pm.c
+++ b/drivers/acpi/device_pm.c
@@ -957,6 +957,7 @@ EXPORT_SYMBOL_GPL(acpi_subsys_prepare);
*/
void acpi_subsys_complete(struct device *dev)
{
+ pm_generic_complete(dev);
/*
* If the device had been runtime-suspended before the system went into
* the sleep state it is going out of and it has never been resumed till