diff options
Diffstat (limited to 'drivers/pci/pci.c')
-rw-r--r-- | drivers/pci/pci.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 1df7c508814e..60f30e7f1c8c 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c | |||
@@ -1193,7 +1193,7 @@ void pci_disable_enabled_device(struct pci_dev *dev) | |||
1193 | * anymore. This only involves disabling PCI bus-mastering, if active. | 1193 | * anymore. This only involves disabling PCI bus-mastering, if active. |
1194 | * | 1194 | * |
1195 | * Note we don't actually disable the device until all callers of | 1195 | * Note we don't actually disable the device until all callers of |
1196 | * pci_device_enable() have called pci_device_disable(). | 1196 | * pci_enable_device() have called pci_disable_device(). |
1197 | */ | 1197 | */ |
1198 | void | 1198 | void |
1199 | pci_disable_device(struct pci_dev *dev) | 1199 | pci_disable_device(struct pci_dev *dev) |
@@ -1631,7 +1631,6 @@ void pci_pm_init(struct pci_dev *dev) | |||
1631 | * let the user space enable it to wake up the system as needed. | 1631 | * let the user space enable it to wake up the system as needed. |
1632 | */ | 1632 | */ |
1633 | device_set_wakeup_capable(&dev->dev, true); | 1633 | device_set_wakeup_capable(&dev->dev, true); |
1634 | device_set_wakeup_enable(&dev->dev, false); | ||
1635 | /* Disable the PME# generation functionality */ | 1634 | /* Disable the PME# generation functionality */ |
1636 | pci_pme_active(dev, false); | 1635 | pci_pme_active(dev, false); |
1637 | } else { | 1636 | } else { |
@@ -1655,7 +1654,6 @@ void platform_pci_wakeup_init(struct pci_dev *dev) | |||
1655 | return; | 1654 | return; |
1656 | 1655 | ||
1657 | device_set_wakeup_capable(&dev->dev, true); | 1656 | device_set_wakeup_capable(&dev->dev, true); |
1658 | device_set_wakeup_enable(&dev->dev, false); | ||
1659 | platform_pci_sleep_wake(dev, false); | 1657 | platform_pci_sleep_wake(dev, false); |
1660 | } | 1658 | } |
1661 | 1659 | ||