aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2015-05-13 19:36:32 -0400
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-05-19 19:55:02 -0400
commit56f487c78015936097474fd89b2ccb229d500d0f (patch)
treee9987286d9ec0bd037bf3207149ab4d010a0d9e0
parentf6a2fbb903d51b1e328d6e358048426ca97932ad (diff)
PM / Runtime: Update last_busy in rpm_resume
If we don't update last_busy in rpm_resume, devices can go back to sleep immediately after resume. This happens at least in cases where the device has been powered off and does not have any interrupt pending until there's something in the FIFO. Signed-off-by: Tony Lindgren <tony@atomide.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
-rw-r--r--drivers/base/power/runtime.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/base/power/runtime.c b/drivers/base/power/runtime.c
index 5070c4fe8542..4ffe4a2add76 100644
--- a/drivers/base/power/runtime.c
+++ b/drivers/base/power/runtime.c
@@ -741,6 +741,7 @@ static int rpm_resume(struct device *dev, int rpmflags)
741 } else { 741 } else {
742 no_callback: 742 no_callback:
743 __update_runtime_status(dev, RPM_ACTIVE); 743 __update_runtime_status(dev, RPM_ACTIVE);
744 pm_runtime_mark_last_busy(dev);
744 if (parent) 745 if (parent)
745 atomic_inc(&parent->power.child_count); 746 atomic_inc(&parent->power.child_count);
746 } 747 }