git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...
[pandora-kernel.git]
/
arch
/
powerpc
/
sysdev
/
mpic.c
diff --git
a/arch/powerpc/sysdev/mpic.c
b/arch/powerpc/sysdev/mpic.c
index
411480d
..
d01ced1
100644
(file)
--- a/
arch/powerpc/sysdev/mpic.c
+++ b/
arch/powerpc/sysdev/mpic.c
@@
-390,7
+390,7
@@
static void __init mpic_scan_ht_pic(struct mpic *mpic, u8 __iomem *devbase,
u8 id = readb(devbase + pos + PCI_CAP_LIST_ID);
if (id == PCI_CAP_ID_HT) {
id = readb(devbase + pos + 3);
- if (
id
== HT_CAPTYPE_IRQ)
+ if (
(id & HT_5BIT_CAP_MASK)
== HT_CAPTYPE_IRQ)
break;
}
}