Commit 96333706 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

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
parents f4c31b07 29ab7682

drivers/base/power/runtime.c

+1 −0
Original line number Diff line number Diff line
@@ -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);

}