diff options
| author | Aurelien Jarno <aurelien@aurel32.net> | 2012-09-21 19:53:26 +0200 |
|---|---|---|
| committer | Aurelien Jarno <aurelien@aurel32.net> | 2012-09-21 19:53:26 +0200 |
| commit | cfb75cb9807463ebe18b127096b48b5d0db1ce03 (patch) | |
| tree | a3b36bd2aa65beda00d9ab3aea00627c72d5bd15 /hw/usb/host-linux.c | |
| parent | e55f523d7977480462151d8abb0ebb4b1747eabf (diff) | |
| parent | 72a04d0c178f01908d74539230d9de64ffc6da19 (diff) | |
| download | qemu-cfb75cb9807463ebe18b127096b48b5d0db1ce03.zip qemu-cfb75cb9807463ebe18b127096b48b5d0db1ce03.tar.gz qemu-cfb75cb9807463ebe18b127096b48b5d0db1ce03.tar.bz2 | |
Merge branch 'usb.65' of git://git.kraxel.org/qemu
* 'usb.65' of git://git.kraxel.org/qemu:
uhci: Don't queue up packets after one with the SPD flag set
usb-redir: Revert usb-redir part of commit 93bfef4c
usb-redir: Add chardev open / close debug logging
usb-redir: Add support for migration
usb-redir: Store max_packet_size in endp_data
usb-redir: Add an already_in_flight packet-id queue
usb-redir: Change cancelled packet code into a generic packet-id queue
ehci: Walk async schedule before and after migration
ehci: Don't set seen to 0 when removing unseen queue-heads
configure: usbredir fixes
ehci: Don't process too much frames in 1 timer tick (v2)
ehci: Fix interrupts stopping when Interrupt Threshold Control is 8
ehci: switch to new-style memory ops
usb-host: allow emulated (non-async) control requests without USBPacket
Diffstat (limited to 'hw/usb/host-linux.c')
| -rw-r--r-- | hw/usb/host-linux.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/usb/host-linux.c b/hw/usb/host-linux.c index 8df9207..44f1a64 100644 --- a/hw/usb/host-linux.c +++ b/hw/usb/host-linux.c @@ -1045,7 +1045,6 @@ static int usb_host_handle_control(USBDevice *dev, USBPacket *p, /* Note request is (bRequestType << 8) | bRequest */ trace_usb_host_req_control(s->bus_num, s->addr, p, request, value, index); - assert(p->result == 0); switch (request) { case DeviceOutRequest | USB_REQ_SET_ADDRESS: @@ -1074,6 +1073,7 @@ static int usb_host_handle_control(USBDevice *dev, USBPacket *p, } /* The rest are asynchronous */ + assert(p && p->result == 0); if (length > sizeof(dev->data_buf)) { fprintf(stderr, "husb: ctrl buffer too small (%d > %zu)\n", |