projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
MSI: arch must connect the irq and the msi_desc
[powerpc.git]
/
arch
/
ia64
/
sn
/
kernel
/
msi_sn.c
diff --git
a/arch/ia64/sn/kernel/msi_sn.c
b/arch/ia64/sn/kernel/msi_sn.c
index
49873aa
..
83f190f
100644
(file)
--- a/
arch/ia64/sn/kernel/msi_sn.c
+++ b/
arch/ia64/sn/kernel/msi_sn.c
@@
-87,7
+87,6
@@
int sn_setup_msi_irq(struct pci_dev *pdev, struct msi_desc *entry)
if (irq < 0)
return irq;
if (irq < 0)
return irq;
- set_irq_msi(irq, entry);
/*
* Set up the vector plumbing. Let the prom (via sn_intr_alloc)
* decide which cpu to direct this msi at by default.
/*
* Set up the vector plumbing. Let the prom (via sn_intr_alloc)
* decide which cpu to direct this msi at by default.
@@
-144,10
+143,11
@@
int sn_setup_msi_irq(struct pci_dev *pdev, struct msi_desc *entry)
*/
msg.data = 0x100 + irq;
*/
msg.data = 0x100 + irq;
+ set_irq_msi(irq, entry);
write_msi_msg(irq, &msg);
set_irq_chip_and_handler(irq, &sn_msi_chip, handle_edge_irq);
write_msi_msg(irq, &msg);
set_irq_chip_and_handler(irq, &sn_msi_chip, handle_edge_irq);
- return
irq
;
+ return
0
;
}
#ifdef CONFIG_SMP
}
#ifdef CONFIG_SMP