Index: uspace/drv/bus/usb/xhci/device.c
===================================================================
--- uspace/drv/bus/usb/xhci/device.c	(revision bf0398cead0d24521491c0d54ad56710a7cc1786)
+++ uspace/drv/bus/usb/xhci/device.c	(revision bb655dab5c3ca3687610d0b331dbf94c79f49ad4)
@@ -236,4 +236,7 @@
 
 err_address:
+	bus_endpoint_remove(xhci_dev->base.endpoints[0]);
+	bus->devices_by_slot[xhci_dev->slot_id] = NULL;
+	hc_disable_slot(xhci_dev);
 	return err;
 }