diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2012-01-19 08:34:38 -0600 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-01-19 08:34:38 -0600 |
| commit | 9ca2140ab10a9fde4e60fb9499a733932d30386f (patch) | |
| tree | 25c964335aa0e281317281ecdbc0d4933401c93c /hw/usb-ohci.c | |
| parent | 8c4ec5c0269bda18bb777a64b2008088d1c632dc (diff) | |
| parent | 322135435b5c6fe47cc7596cd394e433236ee49f (diff) | |
Merge remote-tracking branch 'kraxel/usb.37' into staging
* kraxel/usb.37:
usb-redir: Improve some debugging messages
usb-redir: Try to keep our buffer size near the target size
usb-redir: Pre-fill our isoc input buffer before sending pkts to the host
usb-redir: Dynamically adjust iso buffering size based on ep interval
usb-redir: Clear iso / irq error when stopping the stream
usb: link packets to endpoints not devices
usb: add max_packet_size to USBEndpoint
usb/debug: add usb_ep_dump
usb-desc: USBEndpoint support
usb: add ifnum to USBEndpoint
usb: add USBEndpoint
xhci: Initial xHCI implementation
usb: add audio device model
usb-desc: audio endpoint support
usb: track altsetting in USBDevice
usb: track configuration and interface count in USBDevice.
usb-host: rip out legacy procfs support
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 81488c48e2..69463d2f11 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; } |