diff options
Diffstat (limited to 'drivers/pci/pci-driver.c')
-rw-r--r-- | drivers/pci/pci-driver.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c index 79277fb36c6b..e6515e21afa3 100644 --- a/drivers/pci/pci-driver.c +++ b/drivers/pci/pci-driver.c | |||
@@ -1050,26 +1050,22 @@ static int pci_pm_runtime_idle(struct device *dev) | |||
1050 | { | 1050 | { |
1051 | struct pci_dev *pci_dev = to_pci_dev(dev); | 1051 | struct pci_dev *pci_dev = to_pci_dev(dev); |
1052 | const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL; | 1052 | const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL; |
1053 | int ret = 0; | ||
1053 | 1054 | ||
1054 | /* | 1055 | /* |
1055 | * If pci_dev->driver is not set (unbound), the device should | 1056 | * If pci_dev->driver is not set (unbound), the device should |
1056 | * always remain in D0 regardless of the runtime PM status | 1057 | * always remain in D0 regardless of the runtime PM status |
1057 | */ | 1058 | */ |
1058 | if (!pci_dev->driver) | 1059 | if (!pci_dev->driver) |
1059 | goto out; | 1060 | return 0; |
1060 | 1061 | ||
1061 | if (!pm) | 1062 | if (!pm) |
1062 | return -ENOSYS; | 1063 | return -ENOSYS; |
1063 | 1064 | ||
1064 | if (pm->runtime_idle) { | 1065 | if (pm->runtime_idle) |
1065 | int ret = pm->runtime_idle(dev); | 1066 | ret = pm->runtime_idle(dev); |
1066 | if (ret) | ||
1067 | return ret; | ||
1068 | } | ||
1069 | 1067 | ||
1070 | out: | 1068 | return ret; |
1071 | pm_runtime_suspend(dev); | ||
1072 | return 0; | ||
1073 | } | 1069 | } |
1074 | 1070 | ||
1075 | #else /* !CONFIG_PM_RUNTIME */ | 1071 | #else /* !CONFIG_PM_RUNTIME */ |