diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2018-06-08 11:22:26 +0300 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2018-06-08 11:22:26 +0300 |
| commit | 37acd687269f8cb8366598e292f96eb5605d3e3a (patch) | |
| tree | e49cc91bef34755b9a279b60ed8d10ea01eec725 /drivers/pci/pci-driver.c | |
| parent | 79b83b05b07a40c67ac7196555d2b0293cdf26e7 (diff) | |
| parent | 4b64487fa63a71bbed883b55268ea275da6f8a7a (diff) | |
| download | linux-37acd687269f8cb8366598e292f96eb5605d3e3a.tar.xz | |
Merge branch 'for-4.18/hid-steam' into for-linus
Valve Steam Controller support from Rodrigo Rivas Costa
Diffstat (limited to 'drivers/pci/pci-driver.c')
| -rw-r--r-- | drivers/pci/pci-driver.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c index 6ace47099fc5..b9a131137e64 100644 --- a/drivers/pci/pci-driver.c +++ b/drivers/pci/pci-driver.c @@ -958,10 +958,11 @@ static int pci_pm_freeze(struct device *dev) * devices should not be touched during freeze/thaw transitions, * however. */ - if (!dev_pm_test_driver_flags(dev, DPM_FLAG_SMART_SUSPEND)) + if (!dev_pm_smart_suspend_and_suspended(dev)) { pm_runtime_resume(dev); + pci_dev->state_saved = false; + } - pci_dev->state_saved = false; if (pm->freeze) { int error; |