From: Hans de Goede <hdegoede@redhat.com>
Date: Mon, 3 Sep 2012 10:33:44 +0000 (+0200)
Subject: usb-core: Don't set packet state to complete on a nak
X-Git-Tag: v1.2.1~115
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=597330bd8d9e7d96a699749da8c8b2cd82110151;p=thirdparty%2Fqemu.git

usb-core: Don't set packet state to complete on a nak

This way the hcd can re-use the same packet to retry without needing
to re-init it.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
(cherry picked from commit cc40997489260f405aecccd30d4626ceee862502)

Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
---

diff --git a/hw/usb/core.c b/hw/usb/core.c
index 2da38e7fd02..be6d9368818 100644
--- a/hw/usb/core.c
+++ b/hw/usb/core.c
@@ -399,8 +399,10 @@ int usb_handle_packet(USBDevice *dev, USBPacket *p)
              * otherwise packets can complete out of order!
              */
             assert(!p->ep->pipeline);
-            p->result = ret;
-            usb_packet_set_state(p, USB_PACKET_COMPLETE);
+            if (ret != USB_RET_NAK) {
+                p->result = ret;
+                usb_packet_set_state(p, USB_PACKET_COMPLETE);
+            }
         }
     } else {
         ret = USB_RET_ASYNC;