Patchwork [01/23] hw/usb-musb.c: Don't misuse usb_packet_complete()

login
register
mail settings
Submitter Gerd Hoffmann
Date July 8, 2011, 9:50 a.m.
Message ID <1310118673-26196-2-git-send-email-kraxel@redhat.com>
Download mbox | patch
Permalink /patch/103803/
State New
Headers show

Comments

Gerd Hoffmann - July 8, 2011, 9:50 a.m.
From: Peter Maydell <peter.maydell@linaro.org>

In musb_packet() handle final processing of non-asynchronous
USB packets by directly calling musb_schedule_cb() rather than
going through usb_packet_complete(). The latter will trigger
an assertion because the packet doesn't belong to a device.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 hw/usb-musb.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Patch

diff --git a/hw/usb-musb.c b/hw/usb-musb.c
index 21f35af..d15971f 100644
--- a/hw/usb-musb.c
+++ b/hw/usb-musb.c
@@ -616,7 +616,7 @@  static void musb_packet(MUSBState *s, MUSBEndPoint *ep,
     }
 
     ep->status[dir] = ret;
-    usb_packet_complete(s->port.dev, &ep->packey[dir].p);
+    musb_schedule_cb(s->port.dev, &ep->packey[dir].p);
 }
 
 static void musb_tx_packet_complete(USBPacket *packey, void *opaque)