Commit d45e0855 authored Jan 15, 2009 by James Bottomley Committed by Len Brown Jan 16, 2009

ACPI PCI hotplug: harden against panic regression

ACPI hotplug panic with current git head
http://lkml.org/lkml/2009/1/10/136



Rather than reverting the entire commit that causes the crash:
e8c331e9
"PCI hotplug: introduce functions for ACPI slot detection"

simply harden against it while the changes to
the hotplug code on this particularl machine are understood.

Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
Acked-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Len Brown <len.brown@intel.com>

parent 88d998c2

drivers/pci/hotplug/acpiphp_glue.c

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -266,6 +266,8 @@ static int detect_ejectable_slots(struct pci_bus *pbus)
	int found = acpi_pci_detect_ejectable(pbus);		int found = acpi_pci_detect_ejectable(pbus);
	if (!found) {		if (!found) {
	acpi_handle bridge_handle = acpi_pci_get_bridge_handle(pbus);		acpi_handle bridge_handle = acpi_pci_get_bridge_handle(pbus);
			if (!bridge_handle)
			return 0;
	acpi_walk_namespace(ACPI_TYPE_DEVICE, bridge_handle, (u32)1,		acpi_walk_namespace(ACPI_TYPE_DEVICE, bridge_handle, (u32)1,
	is_pci_dock_device, (void *)&found, NULL);		is_pci_dock_device, (void *)&found, NULL);
	}		}