Skip to content
Commit 69e445ab authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

PM / core: Clear the direct_complete flag on errors

If __device_suspend() runs asynchronously (in which case the device
passed to it is in dpm_suspended_list at that point) and it returns
early on an error or pending wakeup, and the power.direct_complete
flag has been set for the device already, the subsequent
device_resume() will be confused by that and it will call
pm_runtime_enable() incorrectly, as runtime PM has not been
disabled for the device by __device_suspend().

To avoid that, clear power.direct_complete if __device_suspend()
is not going to disable runtime PM for the device before returning.

Fixes: aae4518b

 (PM / sleep: Mechanism to avoid resuming runtime-suspended devices unnecessarily)
Reported-by: default avatarAl Cooper <alcooperx@gmail.com>
Tested-by: default avatarAl Cooper <alcooperx@gmail.com>
Reviewed-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Cc: 3.16+ <stable@vger.kernel.org> # 3.16+
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 17b57b18
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment