Merge branch 'pm-runtime'

rafaeljw · rafaeljw · commit 963337065315 · 2026-03-19T14:49:44.000+01:00
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
diff --git 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);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1895,6 +1895,7 @@ void pm_runtime_reinit(struct device *dev)`
`1895`	`1895`	`void pm_runtime_remove(struct device *dev)`
`1896`	`1896`	`{`
`1897`	`1897`	`__pm_runtime_disable(dev, false);`
	`1898`	`+ flush_work(&dev->power.work);`
`1898`	`1899`	`pm_runtime_reinit(dev);`
`1899`	`1900`	`}`
`1900`	`1901`