From: Tony Lindgren <tony@atomide.com>
Date: Wed, 13 May 2015 23:36:32 +0000 (-0700)
Subject: PM / Runtime: Update last_busy in rpm_resume
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=56f487c;p=openwrt%2Fstaging%2Fblogic.git

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>
---

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);
 	}