From e6bbe8cf2178c9d356a21e274bd1ae20bbdae7ff Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 2 Sep 2025 12:13:46 +0000 Subject: [PATCH] Revert "PM: runtime: Clear power.needs_force_resume in pm_runtime_reinit()" This reverts commit 2f6af29069e03262eb9bf10f65e56d9f6ff26dcc which is commit 89d9cec3b1e9c49bae9375a2db6dc49bc7468af0 upstream. It breaks the Android kernel build and can be brought back in the future in a safe way if it is really needed. Bug: 161946584 Change-Id: I0a280dbc5acd642e5f5d386bf4573f5756aac8ad Signed-off-by: Greg Kroah-Hartman --- drivers/base/power/runtime.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/drivers/base/power/runtime.c b/drivers/base/power/runtime.c index b857d81ac48c..5d15d9e8431d 100644 --- a/drivers/base/power/runtime.c +++ b/drivers/base/power/runtime.c @@ -1711,11 +1711,6 @@ 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; } /**