summaryrefslogtreecommitdiff
path: root/drivers/base/power/runtime.c
diff options
context:
space:
mode:
authorDanilo Krummrich <dakr@kernel.org>2026-03-23 01:13:06 +0300
committerDanilo Krummrich <dakr@kernel.org>2026-03-23 01:13:33 +0300
commit14cf406e083c0541e40cd467ae8336ecceede09e (patch)
treeeed981730c340cf8b3a3369f9a0b3985e246ee25 /drivers/base/power/runtime.c
parent9aa64d2503c6f5a803ff2990608312e5bdc6b0de (diff)
parentc369299895a591d96745d6492d4888259b004a9e (diff)
downloadlinux-14cf406e083c0541e40cd467ae8336ecceede09e.tar.xz
Merge tag 'v7.0-rc5' into driver-core-next
We need the driver-core fixes in here as well to build on top of. Signed-off-by: Danilo Krummrich <dakr@kernel.org>
Diffstat (limited to 'drivers/base/power/runtime.c')
-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);
}