diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2026-01-05 12:01:29 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2026-01-05 12:01:29 +0100 |
| commit | 10c3ab8cd8975cb42b172224440a567b31617bbd (patch) | |
| tree | bae55fbf8d7008e171a2cc6adccef38473208e8f /drivers/base | |
| parent | 684d3b2670a26313bbb99de6d66f384ac0e31c9b (diff) | |
| parent | 4fb352df14de4b5277f38a9874f7c19cf641ae4d (diff) | |
| download | linux-next-10c3ab8cd8975cb42b172224440a567b31617bbd.tar.gz linux-next-10c3ab8cd8975cb42b172224440a567b31617bbd.zip | |
Merge back a commit related to system sleep for 6.20
Diffstat (limited to 'drivers/base')
| -rw-r--r-- | drivers/base/power/main.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c index 97a8b4fcf471..189de5250f25 100644 --- a/drivers/base/power/main.c +++ b/drivers/base/power/main.c @@ -1647,10 +1647,11 @@ static void device_suspend_late(struct device *dev, pm_message_t state, bool asy goto Complete; /* - * Disable runtime PM for the device without checking if there is a - * pending resume request for it. + * After this point, any runtime PM operations targeting the device + * will fail until the corresponding pm_runtime_enable() call in + * device_resume_early(). */ - __pm_runtime_disable(dev, false); + pm_runtime_disable(dev); if (dev->power.syscore) goto Skip; |