UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'pm-runtime' into linux-next 

* pm-runtime:
  PM / Runtime: don't forget to wake up waitqueue on failure
This commit is contained in:
Rafael J. Wysocki 2012-03-28 22:59:13 +02:00
parent 735e941caa f2791d733a
commit 9a4768d849
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/base/power/runtime.c
View File

@ -532,6 +532,8 @@ static int rpm_suspend(struct device *dev, int rpmflags)
dev->power.suspend_time = ktime_set(0, 0); dev->power.suspend_time = ktime_set(0, 0);
dev->power.max_time_suspended_ns = -1; dev->power.max_time_suspended_ns = -1;
dev->power.deferred_resume = false; dev->power.deferred_resume = false;
wake_up_all(&dev->power.wait_queue);
if (retval == -EAGAIN || retval == -EBUSY) { if (retval == -EAGAIN || retval == -EBUSY) {
dev->power.runtime_error = 0; dev->power.runtime_error = 0;
@ -547,7 +549,6 @@ static int rpm_suspend(struct device *dev, int rpmflags)
} else { } else {
pm_runtime_cancel_pending(dev); pm_runtime_cancel_pending(dev);
} }
wake_up_all(&dev->power.wait_queue);
goto out; goto out;
} }