Commit 3c3738c8 authored Jul 26, 2007 by Kenji Kaneshige Committed by Tony Luck Jul 26, 2007

[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: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>

parent 6bde71ec

arch/ia64/kernel/acpi.c

+4 −5

Original line number	Diff line number	Diff line
		@@ -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;
		}