Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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:
e8c331e963c58b83db24b7d0e39e8c07f687dbc6
"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>

authored by

James Bottomley and committed by
Len Brown
d45e0855 88d998c2

+2
+2
drivers/pci/hotplug/acpiphp_glue.c
··· 266 266 int found = acpi_pci_detect_ejectable(pbus); 267 267 if (!found) { 268 268 acpi_handle bridge_handle = acpi_pci_get_bridge_handle(pbus); 269 + if (!bridge_handle) 270 + return 0; 269 271 acpi_walk_namespace(ACPI_TYPE_DEVICE, bridge_handle, (u32)1, 270 272 is_pci_dock_device, (void *)&found, NULL); 271 273 }