diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2012-10-31 10:42:51 +0100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2012-10-31 10:42:51 +0100 |
| commit | f563a5d7a820424756f358e747238f03e866838a (patch) | |
| tree | f78fa474b1933bd395af401a6d745150f4ecd15e /hw/usb/hcd-musb.c | |
| parent | a27365265cc2fed1178bf25a205e8ee02a9c0caf (diff) | |
| parent | aee0bf7d8d7564f8f2c40e4501695c492b7dd8d1 (diff) | |
| download | hqemu-f563a5d7a820424756f358e747238f03e866838a.zip hqemu-f563a5d7a820424756f358e747238f03e866838a.tar.gz | |
Merge remote-tracking branch 'origin/master' into threadpool
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'hw/usb/hcd-musb.c')
| -rw-r--r-- | hw/usb/hcd-musb.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/hw/usb/hcd-musb.c b/hw/usb/hcd-musb.c index dc114fe..4f55390 100644 --- a/hw/usb/hcd-musb.c +++ b/hw/usb/hcd-musb.c @@ -627,7 +627,7 @@ static void musb_packet(MUSBState *s, MUSBEndPoint *ep, dev = usb_find_device(&s->port, ep->faddr[idx]); uep = usb_ep_get(dev, pid, ep->type[idx] & 0xf); usb_packet_setup(&ep->packey[dir].p, pid, uep, - (dev->addr << 16) | (uep->nr << 8) | pid); + (dev->addr << 16) | (uep->nr << 8) | pid, false, true); usb_packet_addbuf(&ep->packey[dir].p, ep->buf[idx], len); ep->packey[dir].ep = ep; ep->packey[dir].dir = dir; @@ -635,6 +635,7 @@ static void musb_packet(MUSBState *s, MUSBEndPoint *ep, ret = usb_handle_packet(dev, &ep->packey[dir].p); if (ret == USB_RET_ASYNC) { + usb_device_flush_ep_queue(dev, uep); ep->status[dir] = len; return; } |
