diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2013-01-08 14:06:51 +0100 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2013-01-14 08:59:40 +0100 |
| commit | 0cb41e2c5ebc1f8fa180a1726981416fee9abad1 (patch) | |
| tree | 9f3c73984e201a4503a1e94bbe38400cfc195949 /hw/usb/hcd-xhci.c | |
| parent | f3dcf6384cc94b6a688f3a366c20642f36247b68 (diff) | |
| download | qemu-0cb41e2c5ebc1f8fa180a1726981416fee9abad1.zip qemu-0cb41e2c5ebc1f8fa180a1726981416fee9abad1.tar.gz qemu-0cb41e2c5ebc1f8fa180a1726981416fee9abad1.tar.bz2 | |
xhci: nuke transfe5rs on detach
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Diffstat (limited to 'hw/usb/hcd-xhci.c')
| -rw-r--r-- | hw/usb/hcd-xhci.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/hw/usb/hcd-xhci.c b/hw/usb/hcd-xhci.c index 5b2e7f8..5fb0c48 100644 --- a/hw/usb/hcd-xhci.c +++ b/hw/usb/hcd-xhci.c @@ -1197,6 +1197,7 @@ static int xhci_ep_nuke_xfers(XHCIState *xhci, unsigned int slotid, ep = epctx->transfers[xferi].packet.ep; } killed += xhci_ep_nuke_one_xfer(&epctx->transfers[xferi]); + epctx->transfers[xferi].packet.ep = NULL; xferi = (xferi + 1) % TD_QUEUE; } if (ep) { @@ -2201,7 +2202,7 @@ static unsigned int xhci_get_slot(XHCIState *xhci, XHCIEvent *event, XHCITRB *tr /* cleanup slot state on usb device detach */ static void xhci_detach_slot(XHCIState *xhci, USBPort *uport) { - int slot; + int slot, ep; for (slot = 0; slot < xhci->numslots; slot++) { if (xhci->slots[slot].uport == uport) { @@ -2212,6 +2213,11 @@ static void xhci_detach_slot(XHCIState *xhci, USBPort *uport) return; } + for (ep = 0; ep < 31; ep++) { + if (xhci->slots[slot].eps[ep]) { + xhci_ep_nuke_xfers(xhci, slot+1, ep+1); + } + } xhci->slots[slot].uport = NULL; } |