From 28cd0e79cf8b7cafa815ce0cf2a68784f2f59608 Mon Sep 17 00:00:00 2001 From: Jiang Liu Date: Thu, 31 Jan 2013 00:10:09 +0800 Subject: [PATCH] --- yaml --- r: 358421 b: refs/heads/master c: 2ca344e8c798127ae01e656838b9b06ed41d1461 h: refs/heads/master i: 358419: 2f08d9c1bfd1ed7939e7461619ee92086ab04ca0 v: v3 --- [refs] | 2 +- trunk/drivers/pci/hotplug/acpiphp_glue.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 0664bf0e1738..b013ff78be9b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 40064acf0c2ca2fdc78cc6f09c3426be8db38a84 +refs/heads/master: 2ca344e8c798127ae01e656838b9b06ed41d1461 diff --git a/trunk/drivers/pci/hotplug/acpiphp_glue.c b/trunk/drivers/pci/hotplug/acpiphp_glue.c index bd784ff4a244..acb7af220310 100644 --- a/trunk/drivers/pci/hotplug/acpiphp_glue.c +++ b/trunk/drivers/pci/hotplug/acpiphp_glue.c @@ -839,6 +839,9 @@ static int __ref enable_device(struct acpiphp_slot *slot) if (slot->flags & SLOT_ENABLED) goto err_exit; + list_for_each_entry(func, &slot->funcs, sibling) + acpiphp_bus_add(func); + num = pci_scan_slot(bus, PCI_DEVFN(slot->device, 0)); if (num == 0) { /* Maybe only part of funcs are added. */ @@ -862,9 +865,6 @@ static int __ref enable_device(struct acpiphp_slot *slot) } } - list_for_each_entry(func, &slot->funcs, sibling) - acpiphp_bus_add(func); - pci_bus_assign_resources(bus); acpiphp_sanitize_bus(bus); acpiphp_set_hpp_values(bus);