projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'mvebu-dt-4.2-3' of git://git.infradead.org/linux-mvebu into next/late
[cascardo/linux.git]
/
arch
/
alpha
/
kernel
/
sys_marvel.c
diff --git
a/arch/alpha/kernel/sys_marvel.c
b/arch/alpha/kernel/sys_marvel.c
index
f21d61f
..
24e41bd
100644
(file)
--- a/
arch/alpha/kernel/sys_marvel.c
+++ b/
arch/alpha/kernel/sys_marvel.c
@@
-331,7
+331,7
@@
marvel_map_irq(const struct pci_dev *cdev, u8 slot, u8 pin)
pci_read_config_byte(dev, PCI_INTERRUPT_LINE, &intline);
irq = intline;
- msi_loc =
pci_find_capability(dev, PCI_CAP_ID_MSI)
;
+ msi_loc =
dev->msi_cap
;
msg_ctl = 0;
if (msi_loc)
pci_read_config_word(dev, msi_loc + PCI_MSI_FLAGS, &msg_ctl);