]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
PM / Runtime: Fix error path in pm_runtime_force_resume()
authorUlf Hansson <ulf.hansson@linaro.org>
Fri, 8 Apr 2016 11:10:23 +0000 (13:10 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 8 Jun 2016 01:14:34 +0000 (18:14 -0700)
commita1e15f5ae6d69e834b751b719d007b380f4a42fb
tree49a13187a865b754de3269bfb825744673acf72f
parent4072a4bcd24f2b07eb1b6dfc2a2e7fac4c501114
PM / Runtime: Fix error path in pm_runtime_force_resume()

commit 0ae3aeefabbeef26294e7a349b51f1c761d46c9f upstream.

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: 37f204164dfb (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>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/base/power/runtime.c