From 280b5e0e09f37567d3d57a01acd12c02c80961bd Mon Sep 17 00:00:00 2001 From: AceLan Kao Date: Tue, 3 Sep 2019 14:56:17 +0800 Subject: [PATCH] UBUNTU: SAUCE: PCI/PM: Don't call pci_finish_runtime_suspend() Don't call pci_finish_runtime_suspend() if runtime PM callback functions are not provided. It leads to backport-iwlwifi driver fails to wakes up from runtime suspend. This commit could be reverted after backport-iwlwifi 7906 dkms driver is released in Ubuntu archive. Signed-off-by: AceLan Kao --- drivers/pci/pci-driver.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c index 34327a5ddf4c..e0809aff63bf 100644 --- a/drivers/pci/pci-driver.c +++ b/drivers/pci/pci-driver.c @@ -1323,6 +1323,10 @@ static int pci_pm_runtime_suspend(struct device *dev) if (!pci_dev->state_saved) { pci_save_state(pci_dev); + + if (!pm || !pm->runtime_suspend) + return -ENOSYS; + pci_finish_runtime_suspend(pci_dev); } -- 2.17.1