Skip to content

Commit

Permalink
[IA64] Fix wrong assumption in acpi_gsi_to_irq
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Kenji Kaneshige authored and Tony Luck committed Jul 26, 2007
1 parent 6bde71e commit 3c3738c
Showing 1 changed file with 4 additions and 5 deletions.
9 changes: 4 additions & 5 deletions arch/ia64/kernel/acpi.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down

0 comments on commit 3c3738c

Please sign in to comment.