---

yaml --- r: 31443 b: refs/heads/master c: 95b38b3 h: refs/heads/master i: 31441: 785849b 31439: ae7de97 v: v3
git-mirror · Jun 28, 2006 · 6897454 · 6897454
1 parent eabffba
commit 6897454
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2b85e1307fe3a84eca2e1a21c6c857359908dab4
+refs/heads/master: 95b38b3f453c16de0f8cddcde3e71050bbfb37b9
diff --git a/trunk/drivers/pci/hotplug/acpiphp_glue.c b/trunk/drivers/pci/hotplug/acpiphp_glue.c
@@ -219,8 +219,13 @@ register_slot(acpi_handle handle, u32 lvl, void *context, void **rv)
 		newfunc->flags |= FUNC_HAS_DCK;
 
 	status = acpi_evaluate_integer(handle, "_SUN", NULL, &sun);
-	if (ACPI_FAILURE(status))
-		sun = -1;
+	if (ACPI_FAILURE(status)) {
+		/*
+		 * use the count of the number of slots we've found
+		 * for the number of the slot
+		 */
+		sun = bridge->nr_slots+1;
+	}
 
 	/* search for objects that share the same slot */
 	for (slot = bridge->slots; slot; slot = slot->next)