summaryrefslogtreecommitdiffstats
path: root/hw
diff options
context:
space:
mode:
authorAnthony Liguori <aliguori@us.ibm.com>2012-05-14 10:06:50 -0500
committerAnthony Liguori <aliguori@us.ibm.com>2012-05-14 10:06:50 -0500
commit82ac96a72b860f6a4f125edd12f85cb21b3d66bf (patch)
treed0df62dba6fa89870cb1cbafdc412ba2c0b81446 /hw
parent90ca64a970b1d10352df3b2c68099341e900abe9 (diff)
parentb65ee4fa29ebfffb96a3ea983c97a664d30efd3f (diff)
downloadhqemu-82ac96a72b860f6a4f125edd12f85cb21b3d66bf.zip
hqemu-82ac96a72b860f6a4f125edd12f85cb21b3d66bf.tar.gz
Merge remote-tracking branch 'sweil/for-1.1' into staging
* sweil/for-1.1: qemu-doc: Use QEMU instead of qemu for product name qemu-doc: Fix executable name in examples qemu-doc: Add missing parameter in description of -D option configure: Use QEMU instead of Qemu fix some common typos qemu-timer: Fix wrong error message
Diffstat (limited to 'hw')
-rw-r--r--hw/usb/hcd-ehci.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/usb/hcd-ehci.c b/hw/usb/hcd-ehci.c
index 4ff4d40..e759c99 100644
--- a/hw/usb/hcd-ehci.c
+++ b/hw/usb/hcd-ehci.c
@@ -1091,8 +1091,8 @@ static void ehci_mem_writel(void *ptr, target_phys_addr_t addr, uint32_t val)
break;
case USBSTS:
- val &= USBSTS_RO_MASK; // bits 6 thru 31 are RO
- ehci_clear_usbsts(s, val); // bits 0 thru 5 are R/WC
+ val &= USBSTS_RO_MASK; // bits 6 through 31 are RO
+ ehci_clear_usbsts(s, val); // bits 0 through 5 are R/WC
val = s->usbsts;
ehci_set_interrupt(s, 0);
break;
OpenPOWER on IntegriCloud