Commit 9f5b5274 authored May 30, 2016 by Ulf Hansson Committed by Rafael J. Wysocki Jun 16, 2016

PM / Runtime: Avoid resuming devices again in pm_runtime_force_resume()

If the runtime PM status of the device isn't RPM_SUSPENDED, prevent the
pm_runtime_force_resume() from invoking the ->runtime_resume() callback
for the device, as it's not the expected behaviour from the subsystem/driver.

Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Reviewed-by: Kevin Hilman <khilman@baylibre.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

parent 9b002b8f

drivers/base/power/runtime.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -1506,6 +1506,9 @@ int pm_runtime_force_resume(struct device *dev)
		goto out;
		}

		if (!pm_runtime_status_suspended(dev))
		goto out;

		ret = pm_runtime_set_active(dev);
		if (ret)
		goto out;