diff --git a/[refs] b/[refs]
index 6cf3fcc2797c..960127a4a857 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 753388c2e91c15c12550bb20dda05ce657cfdc3e
+refs/heads/master: 287af2fbe902206fabd42ade4e94f77db900083e
diff --git a/trunk/drivers/pci/hotplug/acpiphp_glue.c b/trunk/drivers/pci/hotplug/acpiphp_glue.c
index be7e91662417..768d0f0f450a 100644
--- a/trunk/drivers/pci/hotplug/acpiphp_glue.c
+++ b/trunk/drivers/pci/hotplug/acpiphp_glue.c
@@ -1074,9 +1074,9 @@ static int enable_device(struct acpiphp_slot *slot)
 
 	pci_bus_assign_resources(bus);
 	acpiphp_sanitize_bus(bus);
+	acpiphp_set_hpp_values(slot->bridge->handle, bus);
 	pci_enable_bridges(bus);
 	pci_bus_add_devices(bus);
-	acpiphp_set_hpp_values(slot->bridge->handle, bus);
 	acpiphp_configure_ioapics(slot->bridge->handle);
 
 	/* associate pci_dev to our representation */