---

yaml --- r: 63053 b: refs/heads/master c: 3c3738c h: refs/heads/master i: 63051: 589bf9f v: v3
git-mirror · Jul 26, 2007 · 7b6c17a · 7b6c17a
1 parent 03b686a
commit 7b6c17a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6bde71ec1ea1f37254892ef2058176f3171a0d62
+refs/heads/master: 3c3738c874a2d42e84a2b02768f9807c334f3eff
diff --git a/trunk/arch/ia64/kernel/acpi.c b/trunk/arch/ia64/kernel/acpi.c
@@ -741,16 +741,15 @@ int __init acpi_boot_init(void)
 
 int acpi_gsi_to_irq(u32 gsi, unsigned int *irq)
 {
-	int vector;
+	int tmp;
 
 	if (has_8259 && gsi < 16)
 		*irq = isa_irq_to_vector(gsi);
 	else {
-		vector = gsi_to_vector(gsi);
-		if (vector == -1)
+		tmp = gsi_to_irq(gsi);
+		if (tmp == -1)
 			return -1;
-
-		*irq = vector;
+		*irq = tmp;
 	}
 	return 0;
 }