summaryrefslogtreecommitdiffstats
path: root/drivers/base
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2015-05-14 01:36:32 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-05-20 01:55:02 +0200
commit56f487c78015936097474fd89b2ccb229d500d0f (patch)
treee9987286d9ec0bd037bf3207149ab4d010a0d9e0 /drivers/base
parentPM / runtime: add note about re-calling in during device probe() (diff)
downloadlinux-56f487c78015936097474fd89b2ccb229d500d0f.tar.xz
linux-56f487c78015936097474fd89b2ccb229d500d0f.zip
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>
Diffstat (limited to 'drivers/base')
-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)
} else {
no_callback:
__update_runtime_status(dev, RPM_ACTIVE);
+ pm_runtime_mark_last_busy(dev);
if (parent)
atomic_inc(&parent->power.child_count);
}