diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-05-24 08:49:56 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-05-24 08:49:56 -0700 |
| commit | 9ca5a2ae4259e7aec8efb0db0f6ec721a6854c54 (patch) | |
| tree | 6e8ad036dc6809fd7a8c91b6d93a895291209cef | |
| parent | bee797529d7c1ea4e2803fda067d20edbc00bc3d (diff) | |
| parent | c62ec4610c40bcc44f2d3d5ed1c312737279e2f3 (diff) | |
| download | linux-9ca5a2ae4259e7aec8efb0db0f6ec721a6854c54.tar.bz2 | |
Merge tag 'pm-4.17-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull power management fix from Rafael Wysocki:
"Fix a regression from the 4.15 cycle that caused the system suspend
and resume overhead to increase on many systems and triggered more
serious problems on some of them (Rafael Wysocki)"
* tag 'pm-4.17-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
PM / core: Fix direct_complete handling for devices with no callbacks
| -rw-r--r-- | drivers/base/power/main.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c index 02a497e7c785..e5e067091572 100644 --- a/drivers/base/power/main.c +++ b/drivers/base/power/main.c @@ -1923,10 +1923,8 @@ static int device_prepare(struct device *dev, pm_message_t state) dev->power.wakeup_path = false; - if (dev->power.no_pm_callbacks) { - ret = 1; /* Let device go direct_complete */ + if (dev->power.no_pm_callbacks) goto unlock; - } if (dev->pm_domain) callback = dev->pm_domain->ops.prepare; @@ -1960,7 +1958,8 @@ unlock: */ spin_lock_irq(&dev->power.lock); dev->power.direct_complete = state.event == PM_EVENT_SUSPEND && - pm_runtime_suspended(dev) && ret > 0 && + ((pm_runtime_suspended(dev) && ret > 0) || + dev->power.no_pm_callbacks) && !dev_pm_test_driver_flags(dev, DPM_FLAG_NEVER_SKIP); spin_unlock_irq(&dev->power.lock); return 0; |