diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-01-29 13:56:05 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-01-29 13:56:05 +0100 |
| commit | 8a78cf70fae587b0691b4b982bc69c1261e05e76 (patch) | |
| tree | c2b3aa89d4b64c7207250fb9ddff8fc5d717d486 /drivers/pci | |
| parent | 09212fddc8661e67a964d91a6584209784f52500 (diff) | |
| parent | 65ab96f60621c4da8f1b4087a57b788bc4d8f27b (diff) | |
| download | linux-8a78cf70fae587b0691b4b982bc69c1261e05e76.tar.gz | |
Merge branch 'acpi-pm' into acpi-cleanup
The following commits depend on the 'acpi-pm' material.
Diffstat (limited to 'drivers/pci')
| -rw-r--r-- | drivers/pci/pci-acpi.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/pci/pci-acpi.c b/drivers/pci/pci-acpi.c index 42736e213f25..e407c61559ca 100644 --- a/drivers/pci/pci-acpi.c +++ b/drivers/pci/pci-acpi.c @@ -345,7 +345,6 @@ static void pci_acpi_setup(struct device *dev) acpi_pci_irq_add_prt(handle, pci_domain_nr(pci_dev->bus), bus); } - acpi_power_resource_register_device(dev, handle); if (acpi_bus_get_device(handle, &adev) || !adev->wakeup.flags.valid) return; @@ -368,7 +367,6 @@ static void pci_acpi_cleanup(struct device *dev) device_set_run_wake(dev, false); pci_acpi_remove_pm_notifier(adev); } - acpi_power_resource_unregister_device(dev, handle); if (pci_dev->subordinate) acpi_pci_irq_del_prt(pci_domain_nr(pci_dev->bus), |