---

yaml --- r: 129893 b: refs/heads/master c: d45e085 h: refs/heads/master i: 129891: d5681f8 v: v3
git-mirror · Jan 16, 2009 · 02860ed · 02860ed
1 parent d7b28eb
commit 02860ed
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 88d998c264722cd6e8fafa42aee191f7d9194960
+refs/heads/master: d45e0855488032ea62ec5638fb1dcd47367f8ddb
diff --git a/trunk/drivers/pci/hotplug/acpiphp_glue.c b/trunk/drivers/pci/hotplug/acpiphp_glue.c
@@ -266,6 +266,8 @@ static int detect_ejectable_slots(struct pci_bus *pbus)
 	int found = acpi_pci_detect_ejectable(pbus);
 	if (!found) {
 		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,
 				    is_pci_dock_device, (void *)&found, NULL);
 	}