This tries to runtime suspend devices that are still active for direct complete. This is for cases such as autosuspend delays which leaves devices able to runtime suspend but still active. It's beneficial in this case to runtime suspend the device to take advantage of direct complete when possible.
Signed-off-by: Derek Basehore <dbaseh...@chromium.org> Reviewed-by: Eric Caruso <ejcar...@chromium.org> --- drivers/base/power/main.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c index e0017d9..9693032 100644 --- a/drivers/base/power/main.c +++ b/drivers/base/power/main.c @@ -1380,7 +1380,12 @@ static int __device_suspend(struct device *dev, pm_message_t state, bool async) goto Complete; if (dev->power.direct_complete) { - if (pm_runtime_status_suspended(dev)) { + /* + * Check if we're runtime suspended. If not, try to runtime + * suspend for autosuspend cases. + */ + if (pm_runtime_status_suspended(dev) || + !pm_runtime_suspend(dev)) { pm_runtime_disable(dev); if (pm_runtime_status_suspended(dev)) goto Complete; -- 2.7.0.rc3.207.g0ac5344