diff options
| author | Anthony Liguori | 2012-08-15 20:25:54 +0200 |
|---|---|---|
| committer | Anthony Liguori | 2012-08-15 20:25:54 +0200 |
| commit | d1186a33efa74c91b01e1b5d9918c61d109f1b54 (patch) | |
| tree | 5e1430bcd829f18a905b95efd2d4b89d219b250b /hw/usb | |
| parent | Merge remote-tracking branch 'kwolf/for-anthony' into staging (diff) | |
| parent | ivshmem, qdev-monitor: fix order of qerror parameters (diff) | |
| download | qemu-d1186a33efa74c91b01e1b5d9918c61d109f1b54.tar.gz qemu-d1186a33efa74c91b01e1b5d9918c61d109f1b54.tar.xz qemu-d1186a33efa74c91b01e1b5d9918c61d109f1b54.zip | |
Merge remote-tracking branch 'stefanha/trivial-patches' into staging
* stefanha/trivial-patches:
ivshmem, qdev-monitor: fix order of qerror parameters
iov_send_recv(): Handle zero bytes case even if OS does not
framebuffer: Fix spelling in comment (leight -> height)
Spelling fix in comment (peripherans -> peripherals)
docs: Fix spelling (propery -> property)
trace: Fix "Qemu" -> "QEMU"
cputlb.c: Fix out of date comment
ehci: fix assertion typo
Makefile: Avoid explicit list of directories in clean target
Diffstat (limited to 'hw/usb')
| -rw-r--r-- | hw/usb/hcd-ehci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/usb/hcd-ehci.c b/hw/usb/hcd-ehci.c index b043e7c23e..104c21d315 100644 --- a/hw/usb/hcd-ehci.c +++ b/hw/usb/hcd-ehci.c @@ -2010,7 +2010,7 @@ static void ehci_fill_queue(EHCIPacket *p) p->qtdaddr = qtdaddr; p->qtd = qtd; p->usb_status = ehci_execute(p, "queue"); - assert(p->usb_status = USB_RET_ASYNC); + assert(p->usb_status == USB_RET_ASYNC); p->async = EHCI_ASYNC_INFLIGHT; } } |