git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branches 'work.misc' and 'work.dcache' of git://git.kernel.org/pub/scm/linux...
[sfrench/cifs-2.6.git]
/
arch
/
mips
/
loongson64
/
common
/
cs5536
/
cs5536_ohci.c
diff --git
a/arch/mips/loongson64/common/cs5536/cs5536_ohci.c
b/arch/mips/loongson64/common/cs5536/cs5536_ohci.c
index f7c905e50dc415e21eb258b08a69cc61525bd67b..92dc6bafc1271795b3c66b7c21467f3c22214fd0 100644
(file)
--- a/
arch/mips/loongson64/common/cs5536/cs5536_ohci.c
+++ b/
arch/mips/loongson64/common/cs5536/cs5536_ohci.c
@@
-138,7
+138,7
@@
u32 pci_ohci_read_reg(int reg)
break;
case PCI_OHCI_INT_REG:
_rdmsr(DIVIL_MSR_REG(PIC_YSEL_LOW), &hi, &lo);
- if ((
lo & 0x00000f00
) == CS5536_USB_INTR)
+ if ((
(lo >> PIC_YSEL_LOW_USB_SHIFT) & 0xf
) == CS5536_USB_INTR)
conf_data = 1;
break;
default: