diff mbox

[v2,2/5] PM / Runtime: Prevent re-resuming devices in pm_runtime_force_resume()

Message ID 1464600795-26307-3-git-send-email-ulf.hansson@linaro.org
State Accepted
Commit 9f5b52747dbf83816dcd29ea1700813aeb668c0f
Headers show

Commit Message

Ulf Hansson May 30, 2016, 9:33 a.m. UTC 
If the runtime PM status of the device isn't RPM_SUSPENDED, prevent the
pm_runtime_force_resume() to call 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>

---

Changes in v2:
	- Updated changelog.

---
 drivers/base/power/runtime.c | 3 +++
 1 file changed, 3 insertions(+)

-- 
1.9.1
diff mbox

Patch

diff --git a/drivers/base/power/runtime.c b/drivers/base/power/runtime.c
index b746904..09e4eb1 100644
--- a/drivers/base/power/runtime.c
+++ b/drivers/base/power/runtime.c
@@ -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;