summaryrefslogtreecommitdiffstats
path: root/drivers/acpi
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2012-11-13 14:34:06 -0700
committerBjorn Helgaas <bhelgaas@google.com>2012-11-13 14:34:06 -0700
commit7db78a9c864d1baf916d849febef31e274cfcb1f (patch)
treeebbe90db1637aec1f1027dfa9436b0f5ede9453e /drivers/acpi
parentf9c15b429a5c82e613d59a32d4f49cea6e9d64eb (diff)
parent71fbad6c9a28629b6af40b0ff48f36c6610a1394 (diff)
downloadop-kernel-dev-7db78a9c864d1baf916d849febef31e274cfcb1f.zip
op-kernel-dev-7db78a9c864d1baf916d849febef31e274cfcb1f.tar.gz
Merge branch 'pci/misc' into next
* pci/misc: PCI/ACPI: Notify PCI devices when their power resource is turned on PCI: Add GPL license for drivers/pci/ioapic module PCI: Fix bit definitions of PCI_EXP_LNKCAP2 register
Diffstat (limited to 'drivers/acpi')
-rw-r--r--drivers/acpi/pci_bind.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/acpi/pci_bind.c b/drivers/acpi/pci_bind.c
index 911144b..a1dee29 100644
--- a/drivers/acpi/pci_bind.c
+++ b/drivers/acpi/pci_bind.c
@@ -45,6 +45,7 @@ static int acpi_pci_unbind(struct acpi_device *device)
device_set_run_wake(&dev->dev, false);
pci_acpi_remove_pm_notifier(device);
+ acpi_power_resource_unregister_device(&dev->dev, device->handle);
if (!dev->subordinate)
goto out;
@@ -71,6 +72,7 @@ static int acpi_pci_bind(struct acpi_device *device)
return 0;
pci_acpi_add_pm_notifier(device, dev);
+ acpi_power_resource_register_device(&dev->dev, device->handle);
if (device->wakeup.flags.run_wake)
device_set_run_wake(&dev->dev, true);
OpenPOWER on IntegriCloud