Commit 3c3738c8 authored by Kenji Kaneshige's avatar Kenji Kaneshige Committed by Tony Luck

[IA64] Fix wrong assumption in acpi_gsi_to_irq

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: default avatarKenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
parent 6bde71ec
...@@ -741,16 +741,15 @@ int __init acpi_boot_init(void) ...@@ -741,16 +741,15 @@ int __init acpi_boot_init(void)
int acpi_gsi_to_irq(u32 gsi, unsigned int *irq) int acpi_gsi_to_irq(u32 gsi, unsigned int *irq)
{ {
int vector; int tmp;
if (has_8259 && gsi < 16) if (has_8259 && gsi < 16)
*irq = isa_irq_to_vector(gsi); *irq = isa_irq_to_vector(gsi);
else { else {
vector = gsi_to_vector(gsi); tmp = gsi_to_irq(gsi);
if (vector == -1) if (tmp == -1)
return -1; return -1;
*irq = tmp;
*irq = vector;
} }
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment