diff options
| author | Gerd Hoffmann | 2012-09-06 12:03:41 +0200 |
|---|---|---|
| committer | Gerd Hoffmann | 2012-09-12 08:09:48 +0200 |
| commit | 63587e31353b6652cadfcfb869f5692a2b69daeb (patch) | |
| tree | bbd31242ec0a5e5a3e04d1e846343ba11b48fd58 | |
| parent | Merge branch 'usb.64' of git://git.kraxel.org/qemu (diff) | |
| download | qemu-63587e31353b6652cadfcfb869f5692a2b69daeb.tar.gz qemu-63587e31353b6652cadfcfb869f5692a2b69daeb.tar.xz qemu-63587e31353b6652cadfcfb869f5692a2b69daeb.zip | |
usb-host: allow emulated (non-async) control requests without USBPacket
xhci needs this for USB_REQ_SET_ADDRESS due to the way
usb addressing is handled by the xhci hardware.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
| -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 8df92074d3..44f1a64b35 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", |