Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
  PCI hotplug: Fix unexpected driver unregister in pciehp_acpi.c

1 files changed, 2 insertions, 1 deletions

diff --git a/drivers/pci/hotplug/pciehp_acpi.c b/drivers/pci/hotplug/pciehp_acpi.c
index 2574700db461..5f7226223a62 100644
--- a/drivers/pci/hotplug/pciehp_acpi.c
+++ b/drivers/pci/hotplug/pciehp_acpi.c
@@ -115,7 +115,8 @@ static struct pcie_port_service_driver __initdata dummy_driver = {
 static int __init select_detection_mode(void)
 {
         struct dummy_slot *slot, *tmp;
-        pcie_port_service_register(&dummy_driver);
+        if (pcie_port_service_register(&dummy_driver))
+                return PCIEHP_DETECT_ACPI;
         pcie_port_service_unregister(&dummy_driver);
         list_for_each_entry_safe(slot, tmp, &dummy_slots, list) {
                 list_del(&slot->list);