]> xenbits.xensource.com Git - qemu-upstream-4.6-testing.git/commitdiff
xhci: child detach fix
authorGerd Hoffmann <kraxel@redhat.com>
Mon, 12 May 2014 12:43:51 +0000 (14:43 +0200)
committerGerd Hoffmann <kraxel@redhat.com>
Mon, 26 May 2014 06:41:07 +0000 (08:41 +0200)
xhci_child_detach() zaps the wrong slot when unplugging a device
connected via usb-hub:  Instead of the device's slot the slot of the
usb-hub is used.  Fix it.

https://bugzilla.redhat.com/show_bug.cgi?id=1075846

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Gonglei <arei.gonglei@huawei.com>
hw/usb/hcd-xhci.c

index ef3177aee96c76f6254b21351b4dc1832d3daaa8..6753a4263dbd08abf5042f35bce05b63bf40c75b 100644 (file)
@@ -3435,7 +3435,7 @@ static void xhci_child_detach(USBPort *uport, USBDevice *child)
     USBBus *bus = usb_bus_from_device(child);
     XHCIState *xhci = container_of(bus, XHCIState, bus);
 
-    xhci_detach_slot(xhci, uport);
+    xhci_detach_slot(xhci, child->port);
 }
 
 static USBPortOps xhci_uport_ops = {