aboutsummaryrefslogtreecommitdiff
path: root/hw/usb
diff options
context:
space:
mode:
authorGerd Hoffmann <kraxel@redhat.com>2012-08-09 10:57:32 +0200
committerGerd Hoffmann <kraxel@redhat.com>2012-08-16 08:39:49 +0200
commitc19537a1143d493897850576394f082914f39ef1 (patch)
tree29a3fff48cb7c86e1f6b474f9876d0c9062b16de /hw/usb
parent2b97f88c927be3ff3722497980048bc1cb7cc571 (diff)
usb: async control xfer fixup
Need to clear p->result after copying setup data using usb_packet_copy() because we'll reuse the USBPacket for the data transfer. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Diffstat (limited to 'hw/usb')
-rw-r--r--hw/usb/core.c1
-rw-r--r--hw/usb/host-linux.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/hw/usb/core.c b/hw/usb/core.c
index 01a7622837..c7e5bc047f 100644
--- a/hw/usb/core.c
+++ b/hw/usb/core.c
@@ -107,6 +107,7 @@ static int do_token_setup(USBDevice *s, USBPacket *p)
}
usb_packet_copy(p, s->setup_buf, p->iov.size);
+ p->result = 0;
s->setup_len = (s->setup_buf[7] << 8) | s->setup_buf[6];
s->setup_index = 0;
diff --git a/hw/usb/host-linux.c b/hw/usb/host-linux.c
index d55be878ad..8df92074d3 100644
--- a/hw/usb/host-linux.c
+++ b/hw/usb/host-linux.c
@@ -1045,6 +1045,7 @@ 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: