aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2015-10-06 21:04:21 +0530
committerTero Kristo <t-kristo@ti.com>2015-10-09 10:56:28 +0300
commit69fe6d59b94379772dfefaf94075b7ea8b889a14 (patch)
treeac7517aeb69a618c5de08b326036c55ef83089fd
parentde7f9ad1209a04096bf585b593b75c80dae65011 (diff)
downloadjacinto6evm-69fe6d59b94379772dfefaf94075b7ea8b889a14.tar.gz
PM / Runtime: Update last_busy in rpm_resume
commit 56f487c78015936097474fd89b2ccb229d500d0f upstream. 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> Signed-off-by: Sekhar Nori <nsekhar@ti.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 af89a916ac24..e1a10a03df8e 100644
--- a/drivers/base/power/runtime.c
+++ b/drivers/base/power/runtime.c
@@ -746,6 +746,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);
}