xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'acpi-pm' into acpi-cleanup

Browse Source 
The following commits depend on the 'acpi-pm' material.
This commit is contained in:
Rafael J. Wysocki
2013-01-29 13:56:05 +01:00
parent 09212fddc8 65ab96f606
commit 8a78cf70fa
23 changed files with 1339 additions and 923 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/pci/pci-acpi.c
View File

@@ -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),