diff options
| author | Dave Airlie <airlied@redhat.com> | 2010-08-02 02:05:18 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-08-02 02:05:24 +0200 |
| commit | d656ae53f64cb0f01dac8a02c4d31453d64ef97c (patch) | |
| tree | cf641d4e5828b8f7c430b42657237c5daf9571fd /arch/mips/loongson/common/cs5536/cs5536_ehci.c | |
| parent | drm: radeon: fix sign bug (diff) | |
| parent | Linux 2.6.35-rc6 (diff) | |
| download | linux-d656ae53f64cb0f01dac8a02c4d31453d64ef97c.tar.xz linux-d656ae53f64cb0f01dac8a02c4d31453d64ef97c.zip | |
Merge tag 'v2.6.35-rc6' into drm-radeon-next
Need this to avoid conflicts with future radeon fixes
Diffstat (limited to 'arch/mips/loongson/common/cs5536/cs5536_ehci.c')
| -rw-r--r-- | arch/mips/loongson/common/cs5536/cs5536_ehci.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/mips/loongson/common/cs5536/cs5536_ehci.c b/arch/mips/loongson/common/cs5536/cs5536_ehci.c index eaf8b86e3318..5b5cbba699b3 100644 --- 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; |