Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 324265
b: refs/heads/master
c: c8e9afb
h: refs/heads/master
i:
  324263: 48462a4
v: v3
  • Loading branch information
Jiang Liu authored and Bjorn Helgaas committed Sep 24, 2012
1 parent c8c803e commit 9bf27c3
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 8ee5bdf3e9c99808bf271aa5cc41d689e6d9d3eb
refs/heads/master: c8e9afb124f61e0c9901801f4c95ae4208bd4536
11 changes: 11 additions & 0 deletions trunk/drivers/acpi/pci_root.c
Original file line number Diff line number Diff line change
Expand Up @@ -626,14 +626,25 @@ static int __devinit acpi_pci_root_add(struct acpi_device *device)
static int acpi_pci_root_start(struct acpi_device *device)
{
struct acpi_pci_root *root = acpi_driver_data(device);
struct acpi_pci_driver *driver;

list_for_each_entry(driver, &acpi_pci_drivers, node)
if (driver->add)
driver->add(device->handle);

pci_bus_add_devices(root->bus);

return 0;
}

static int acpi_pci_root_remove(struct acpi_device *device, int type)
{
struct acpi_pci_root *root = acpi_driver_data(device);
struct acpi_pci_driver *driver;

list_for_each_entry(driver, &acpi_pci_drivers, node)
if (driver->remove)
driver->remove(root->device->handle);

device_set_run_wake(root->bus->bridge, false);
pci_acpi_remove_bus_pm_notifier(device);
Expand Down

0 comments on commit 9bf27c3

Please sign in to comment.