Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+2
-1
+2
-1
drivers/pci/hotplug/pciehp_acpi.c
+2
-1
drivers/pci/hotplug/pciehp_acpi.c
···
115
115
static int __init select_detection_mode(void)
116
116
{
117
117
struct dummy_slot *slot, *tmp;
118
-
pcie_port_service_register(&dummy_driver);
118
+
if (pcie_port_service_register(&dummy_driver))
119
+
return PCIEHP_DETECT_ACPI;
119
120
pcie_port_service_unregister(&dummy_driver);
120
121
list_for_each_entry_safe(slot, tmp, &dummy_slots, list) {
121
122
list_del(&slot->list);