summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2026-03-19 14:49:44 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2026-03-19 14:49:44 +0100
commit9633370653151a0d5637634d1887d2f32511e69f (patch)
tree5d080218dadd228de99d089e5902015e02b37fbf
parentf4c31b07b136839e0fb3026f8a5b6543e3b14d2f (diff)
parent29ab768277617452d88c0607c9299cdc63b6e9ff (diff)
Merge branch 'pm-runtime'
Merge a fix for a race condition related to device removal (Bart Van Assche) for 7.0-rc5. * pm-runtime: PM: runtime: Fix a race condition related to device removal
-rw-r--r--drivers/base/power/runtime.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/base/power/runtime.c b/drivers/base/power/runtime.c
index 0ee8ea971aa4..335288e8b5b3 100644
--- a/drivers/base/power/runtime.c
+++ b/drivers/base/power/runtime.c
@@ -1895,6 +1895,7 @@ void pm_runtime_reinit(struct device *dev)
void pm_runtime_remove(struct device *dev)
{
__pm_runtime_disable(dev, false);
+ flush_work(&dev->power.work);
pm_runtime_reinit(dev);
}