diff options
| author | Greg Kroah-Hartman | 2017-08-14 22:29:31 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2017-08-14 22:29:31 +0200 |
| commit | d985524680b77a1cf90738db9a2d72065a746afa (patch) | |
| tree | 101857c3e59f9238b0c7d4bbbf58e46476957387 /drivers/misc/mei/pci-me.c | |
| parent | MAINTAINERS: fpga: Update email and add patchwork URL (diff) | |
| parent | Linux 4.13-rc5 (diff) | |
| download | kernel-qcow2-linux-d985524680b77a1cf90738db9a2d72065a746afa.tar.gz kernel-qcow2-linux-d985524680b77a1cf90738db9a2d72065a746afa.tar.xz kernel-qcow2-linux-d985524680b77a1cf90738db9a2d72065a746afa.zip | |
Merge 4.13-rc5 into char-misc-next
We want the firmware, and other changes, in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/misc/mei/pci-me.c')
| -rw-r--r-- | drivers/misc/mei/pci-me.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/misc/mei/pci-me.c b/drivers/misc/mei/pci-me.c index 3f4e36b8892f..4ff40d319676 100644 --- a/drivers/misc/mei/pci-me.c +++ b/drivers/misc/mei/pci-me.c @@ -220,6 +220,12 @@ static int mei_me_probe(struct pci_dev *pdev, const struct pci_device_id *ent) pci_set_drvdata(pdev, dev); /* + * MEI requires to resume from runtime suspend mode + * in order to perform link reset flow upon system suspend. + */ + pdev->dev_flags |= PCI_DEV_FLAGS_NEEDS_RESUME; + + /* * For not wake-able HW runtime pm framework * can't be used on pci device level. * Use domain runtime pm callbacks instead. |