Commit d45e0855488032ea62ec5638fb1dcd47367f8ddb
Committed by
Len Brown
Len Brown
1 parent
88d998c264
Exists in
master
and in
20 other branches
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>
Showing 1 changed file with 2 additions and 0 deletions Side-by-side Diff
drivers/pci/hotplug/acpiphp_glue.c
| ... | ... | @@ -266,6 +266,8 @@ |
| 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 | } |