Index: uspace/drv/bus/usb/xhci/bus.c
===================================================================
--- uspace/drv/bus/usb/xhci/bus.c	(revision 6b2930bfefb987dc1d4ba5cbee4cf72814ef52ce)
+++ uspace/drv/bus/usb/xhci/bus.c	(revision 62f802523b41e74b299ba42124cacd5321011b0a)
@@ -439,8 +439,7 @@
 	/* Tear down TRB ring / PSA. */
 	/* TODO: Make this method "noexcept" */
-	/* FIXME: There is some memory corruption going on, causing this to crash. */
-	/*if ((err = xhci_endpoint_free_transfer_ds(ep))) {
+	if ((err = xhci_endpoint_free_transfer_ds(ep))) {
 		usb_log_error("Failed to free resources of an endpoint.");
-	}*/
+	}
 
 	return EOK;
Index: uspace/drv/bus/usb/xhci/endpoint.c
===================================================================
--- uspace/drv/bus/usb/xhci/endpoint.c	(revision 6b2930bfefb987dc1d4ba5cbee4cf72814ef52ce)
+++ uspace/drv/bus/usb/xhci/endpoint.c	(revision 62f802523b41e74b299ba42124cacd5321011b0a)
@@ -203,4 +203,7 @@
 int xhci_endpoint_free_transfer_ds(xhci_endpoint_t *xhci_ep)
 {
+	/* FIXME: For some reason (possibly memory corruption), this crashes. */
+	return EOK;
+
 	if (endpoint_using_streams(xhci_ep)) {
 		usb_log_debug2("Freeing primary stream context array for endpoint " XHCI_EP_FMT, XHCI_EP_ARGS(*xhci_ep));