diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2011-12-13 15:58:19 +0100 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2012-01-17 09:44:50 +0100 |
| commit | 25d5de7d81a5b1a5c625775648d3d92e8398741c (patch) | |
| tree | d27fdeb3d10f8fb510722ff093b814764d726cbb /hw/usb-ohci.c | |
| parent | f003397ce95441cd8de01a728affb3de7accd1dd (diff) | |
| download | qemu-25d5de7d81a5b1a5c625775648d3d92e8398741c.zip qemu-25d5de7d81a5b1a5c625775648d3d92e8398741c.tar.gz qemu-25d5de7d81a5b1a5c625775648d3d92e8398741c.tar.bz2 | |
usb: link packets to endpoints not devices
Add USBEndpoint for the control endpoint to USBDevices. Link async
packets to the USBEndpoint instead of the USBDevice.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Diffstat (limited to 'hw/usb-ohci.c')
| -rw-r--r-- | hw/usb-ohci.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/hw/usb-ohci.c b/hw/usb-ohci.c index 81488c4..69463d2 100644 --- a/hw/usb-ohci.c +++ b/hw/usb-ohci.c @@ -1707,7 +1707,9 @@ static void ohci_mem_write(void *opaque, static void ohci_async_cancel_device(OHCIState *ohci, USBDevice *dev) { - if (ohci->async_td && ohci->usb_packet.owner == dev) { + if (ohci->async_td && + ohci->usb_packet.owner != NULL && + ohci->usb_packet.owner->dev == dev) { usb_cancel_packet(&ohci->usb_packet); ohci->async_td = 0; } |