[IA64] Fix wrong assumption in acpi_gsi_to_irq
authorKenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
Thu, 26 Jul 2007 06:31:34 +0000 (15:31 +0900)
committerTony Luck <tony.luck@intel.com>
Thu, 26 Jul 2007 21:27:42 +0000 (14:27 -0700)
The ia64's acpi_gsi_to_irq() function assumes irq == vector. But in
fact irq can be different from vector. This patch fix this wrong
assumption.

Signed-off-by: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
arch/ia64/kernel/acpi.c

index c6ede8780dedc0afdf2489a55b7f9d262ca653d1..3d45d24a9d613ce66215c5399d513dd24239e3c2 100644 (file)
@@ -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;
 }