From 71b5be117e20c79090eea75b72b8d56092719a91 Mon Sep 17 00:00:00 2001 From: Huang Ying Date: Wed, 7 Nov 2012 08:57:59 +0800 Subject: [PATCH] --- yaml --- r: 343265 b: refs/heads/master c: 71fbad6c9a28629b6af40b0ff48f36c6610a1394 h: refs/heads/master i: 343263: 116e950971eebb6e5eb9c46ce97e0e5971c1fcba v: v3 --- [refs] | 2 +- trunk/drivers/acpi/pci_bind.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 0aebc3f3fba6..6d7cb4ff7017 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: eba48cd0f05ff7a2f82291feae169c14b61b29af +refs/heads/master: 71fbad6c9a28629b6af40b0ff48f36c6610a1394 diff --git a/trunk/drivers/acpi/pci_bind.c b/trunk/drivers/acpi/pci_bind.c index 2ef04098cc1d..f1ea71c80ab6 100644 --- a/trunk/drivers/acpi/pci_bind.c +++ b/trunk/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);