aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorKenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>2007-10-30 03:01:49 -0400
committerTony Luck <tony.luck@intel.com>2007-10-30 12:54:47 -0400
commit3aff03739cb19938b25ac262be90faf58192e847 (patch)
tree49ce33789a1af69b15baab5962812a5a102a6893 /arch
parent41f667f213da4776e5883ce1e4188dc8e71f275e (diff)
[IA64] Fix incorrect return value from ia64_setup_msi_irq()
Fix the problem that pci_enable_msi() fails on ia64 platform. The cause of this problem is incorrect return value of ia64_setup_msi_irq(). It must return 0 on success, instead of irq number. Signed-off-by: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com> Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/ia64/kernel/msi_ia64.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/kernel/msi_ia64.c b/arch/ia64/kernel/msi_ia64.c
index 2fdbd5c3f213..e86d02959794 100644
--- a/arch/ia64/kernel/msi_ia64.c
+++ b/arch/ia64/kernel/msi_ia64.c
@@ -109,7 +109,7 @@ int ia64_setup_msi_irq(struct pci_dev *pdev, struct msi_desc *desc)
109 write_msi_msg(irq, &msg); 109 write_msi_msg(irq, &msg);
110 set_irq_chip_and_handler(irq, &ia64_msi_chip, handle_edge_irq); 110 set_irq_chip_and_handler(irq, &ia64_msi_chip, handle_edge_irq);
111 111
112 return irq; 112 return 0;
113} 113}
114 114
115void ia64_teardown_msi_irq(unsigned int irq) 115void ia64_teardown_msi_irq(unsigned int irq)