diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2020-05-02 21:59:03 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2020-05-02 21:59:03 +0200 |
| commit | 3a4ccdb92e1e0f51844c8b60f2c0f48a4a620000 (patch) | |
| tree | 1aae97732648963bc9604a4a378a9fd2446faa5f /drivers/misc | |
| parent | 2351f8d295ed63393190e39c2f7c1fee1a80578f (diff) | |
| parent | 598cc93005636e32a98ed003b0158329827c0ccb (diff) | |
Merge back system-wide PM material for v5.8.
Diffstat (limited to 'drivers/misc')
| -rw-r--r-- | drivers/misc/mei/pci-me.c | 2 | ||||
| -rw-r--r-- | drivers/misc/mei/pci-txe.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/misc/mei/pci-me.c b/drivers/misc/mei/pci-me.c index 0c390fe421ad..34391b477dc8 100644 --- a/drivers/misc/mei/pci-me.c +++ b/drivers/misc/mei/pci-me.c @@ -241,7 +241,7 @@ static int mei_me_probe(struct pci_dev *pdev, const struct pci_device_id *ent) * MEI requires to resume from runtime suspend mode * in order to perform link reset flow upon system suspend. */ - dev_pm_set_driver_flags(&pdev->dev, DPM_FLAG_NEVER_SKIP); + dev_pm_set_driver_flags(&pdev->dev, DPM_FLAG_NO_DIRECT_COMPLETE); /* * ME maps runtime suspend/resume to D0i states, diff --git a/drivers/misc/mei/pci-txe.c b/drivers/misc/mei/pci-txe.c index beacf2a2f2b5..4bf26ce61044 100644 --- a/drivers/misc/mei/pci-txe.c +++ b/drivers/misc/mei/pci-txe.c @@ -128,7 +128,7 @@ static int mei_txe_probe(struct pci_dev *pdev, const struct pci_device_id *ent) * MEI requires to resume from runtime suspend mode * in order to perform link reset flow upon system suspend. */ - dev_pm_set_driver_flags(&pdev->dev, DPM_FLAG_NEVER_SKIP); + dev_pm_set_driver_flags(&pdev->dev, DPM_FLAG_NO_DIRECT_COMPLETE); /* * TXE maps runtime suspend/resume to own power gating states, |