Skip to contentSkip to conversation

PCI / Hotplug: Fix unexpected driver unregister in pciehp_acpi.c

PATCH Superseded Rafael J. Wysocki 1 participant 1 message Dec 16, 2010

Subsystems (2)
ACPI PCI
lore
Share & tools
lore

Rafael J. Wysocki

author
#0 lore raw

PATCH 1/1 PCI / Hotplug: Fix unexpected driver unregister in pciehp_acpi.c

From: Rafael J. Wysocki <[email protected]>

If pcie_ports_disabled is set, pcie_port_service_register() returns error code and select_detection_mode() should not attempt to unregister dummy_driver and use dummy_slots. It should return PCIEHP_DETECT_ACPI immediately instead.

Signed-off-by Rafael J. Wysocki <[email protected]>
---
 drivers/pci/hotplug/pciehp_acpi.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/pci/hotplug/pciehp_acpi.c +2 -1
Index: linux-2.6/drivers/pci/hotplug/pciehp_acpi.c
===================================================================
@@ -115,7 +115,8 @@ static struct pcie_port_service_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);