Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-25 13:41:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

PM / Runtime: Fix error path in pm_runtime_force_resume()

Browse Source 
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: 37f204164d (PM: Add pm_runtime_suspend|resume_force functions)
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Cc: 3.15+ <stable@vger.kernel.org> # 3.15+
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
Ulf Hansson 2016-04-08 13:10:23 +02:00 committed by Rafael J. Wysocki
parent 16669befb0
commit 0ae3aeefab
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/base/power/runtime.c
View File

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