Commit 0ae3aeef authored by Ulf Hansson's avatar Ulf Hansson Committed by Rafael J. Wysocki

PM / Runtime: Fix error path in pm_runtime_force_resume()

As pm_runtime_set_active() may fail because the device's parent isn't
active, we can end up executing the ->runtime_resume() callback for the
device when it isn't allowed.

Fix this by invoking pm_runtime_set_active() before running the callback
and let's also deal with the error code.

Fixes: 37f20416 (PM: Add pm_runtime_suspend|resume_force functions)
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Reviewed-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Cc: 3.15+ <stable@vger.kernel.org> # 3.15+
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 16669bef
...@@ -1506,11 +1506,16 @@ int pm_runtime_force_resume(struct device *dev) ...@@ -1506,11 +1506,16 @@ int pm_runtime_force_resume(struct device *dev)
goto out; goto out;
} }
ret = callback(dev); ret = pm_runtime_set_active(dev);
if (ret) if (ret)
goto out; goto out;
pm_runtime_set_active(dev); ret = callback(dev);
if (ret) {
pm_runtime_set_suspended(dev);
goto out;
}
pm_runtime_mark_last_busy(dev); pm_runtime_mark_last_busy(dev);
out: out:
pm_runtime_enable(dev); pm_runtime_enable(dev);
......
Markdown is supported
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