From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Fri, 27 Jun 2025 19:16:05 +0000 (+0200)
Subject: PM: runtime: Clear power.needs_force_resume in pm_runtime_reinit()
X-Git-Tag: v6.16.2~406
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f16e42f6b09bfdb1bffb3cd15590396676277938;p=thirdparty%2Fkernel%2Fstable.git

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 c55a7c70bc1a8..1ef26216f9718 100644
--- a/drivers/base/power/runtime.c
+++ b/drivers/base/power/runtime.c
@@ -1854,6 +1854,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;
 }
 
 /**