PM: runtime: Clear power.needs_force_resume in pm_runtime_reinit()

[ Upstream commit 89d9cec3b1e9c49bae9375a2db6dc49bc7468af0 ]

Clear power.needs_force_resume in pm_runtime_reinit() in case it has
been set by pm_runtime_force_suspend() invoked from a driver remove
callback.

Suggested-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-by: Ulf Hansson <ulf.hansson@linaro.org>
Link: https://patch.msgid.link/9495163.CDJkKcVGEf@rjwysocki.net
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/base/power/runtime.c b/drivers/base/power/runtime.c
index 58d376b1cd680d3e9d83575753c0efd6c37bc97f..7e912d2ed4270e8e7d92b3bdeb04737e43753d0d 100644 (file)
--- a/drivers/base/power/runtime.c
+++ b/drivers/base/power/runtime.c
@@ -1716,6 +1716,11 @@ void pm_runtime_reinit(struct device *dev)
                                pm_runtime_put(dev->parent);
                }
        }
+       /*
+        * Clear power.needs_force_resume in case it has been set by
+        * pm_runtime_force_suspend() invoked from a driver remove callback.
+        */
+       dev->power.needs_force_resume = false;
 }
 
 /**