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 branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt...
[sfrench/cifs-2.6.git]
/
arch
/
mips
/
loongson
/
common
/
cs5536
/
cs5536_ehci.c
diff --git
a/arch/mips/loongson/common/cs5536/cs5536_ehci.c
b/arch/mips/loongson/common/cs5536/cs5536_ehci.c
index eaf8b86e331816bcd34881607296c8e6443df44f..5b5cbba699b3fc0238dabc1dc46878e18b14df84 100644
(file)
--- a/
arch/mips/loongson/common/cs5536/cs5536_ehci.c
+++ b/
arch/mips/loongson/common/cs5536/cs5536_ehci.c
@@
-49,6
+49,8
@@
void pci_ehci_write_reg(int reg, u32 value)
lo |= SOFT_BAR_EHCI_FLAG;
_wrmsr(GLCP_MSR_REG(GLCP_SOFT_COM), hi, lo);
} else if ((value & 0x01) == 0x00) {
+ _rdmsr(USB_MSR_REG(USB_EHCI), &hi, &lo);
+ lo = value;
_wrmsr(USB_MSR_REG(USB_EHCI), hi, lo);
value &= 0xfffffff0;