Patchwork [for-1.2,1/4] usb: async control xfer fixup

login
register
mail settings
Submitter Gerd Hoffmann
Date Aug. 16, 2012, 10:11 a.m.
Message ID <1345111910-26791-2-git-send-email-kraxel@redhat.com>
Download mbox | patch
Permalink /patch/177957/
State New
Headers show

Comments

Gerd Hoffmann - Aug. 16, 2012, 10:11 a.m.
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>
---
 hw/usb/core.c       |    1 +
 hw/usb/host-linux.c |    1 +
 2 files changed, 2 insertions(+), 0 deletions(-)

Patch

diff --git a/hw/usb/core.c b/hw/usb/core.c
index 01a7622..c7e5bc0 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 d55be87..8df9207 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: