Index: uspace/drv/bus/usb/ehci/hw_struct/queue_head.c
===================================================================
--- uspace/drv/bus/usb/ehci/hw_struct/queue_head.c	(revision 18b6a8849d630cc3bca153fb21bd225eebb16f4c)
+++ uspace/drv/bus/usb/ehci/hw_struct/queue_head.c	(revision 3fafe5e03bb501f8627b315f8e97330dd3996f86)
@@ -55,5 +55,7 @@
 
 	EHCI_MEM32_WR(instance->horizontal, LINK_POINTER_TERM);
-//	EHCI_MEM32_WR(instance->current, LINK_POINTER_TERM);
+#if 0
+	EHCI_MEM32_WR(instance->current, LINK_POINTER_TERM);
+#endif
 	EHCI_MEM32_WR(instance->next, LINK_POINTER_TERM);
 	EHCI_MEM32_WR(instance->alternate, LINK_POINTER_TERM);
Index: uspace/drv/bus/usb/uhci/uhci_rh.c
===================================================================
--- uspace/drv/bus/usb/uhci/uhci_rh.c	(revision 18b6a8849d630cc3bca153fb21bd225eebb16f4c)
+++ uspace/drv/bus/usb/uhci/uhci_rh.c	(revision 3fafe5e03bb501f8627b315f8e97330dd3996f86)
@@ -246,5 +246,7 @@
 	    UHCI2USB(val, STATUS_CONNECTED_CHANGED, USB_HUB_PORT_STATUS_C_CONNECTION) |
 	    UHCI2USB(val, STATUS_ENABLED_CHANGED, USB2_HUB_PORT_STATUS_C_ENABLE) |
-//	    UHCI2USB(val, STATUS_SUSPEND, USB2_HUB_PORT_STATUS_C_SUSPEND) |
+#if 0
+	    UHCI2USB(val, STATUS_SUSPEND, USB2_HUB_PORT_STATUS_C_SUSPEND) |
+#endif
 	    (hub->reset_changed[port] ?  USB_HUB_PORT_STATUS_C_RESET : 0));
 	RH_DEBUG(hub, port, "Port status %" PRIx32 " (source %" PRIx16
Index: uspace/drv/bus/usb/xhci/hw_struct/trb.h
===================================================================
--- uspace/drv/bus/usb/xhci/hw_struct/trb.h	(revision 18b6a8849d630cc3bca153fb21bd225eebb16f4c)
+++ uspace/drv/bus/usb/xhci/hw_struct/trb.h	(revision 3fafe5e03bb501f8627b315f8e97330dd3996f86)
@@ -48,5 +48,7 @@
 	XHCI_TRB_TYPE_RESERVED = 0,
 
-// Transfer ring:
+	/*
+	 * Transfer ring:
+	 */
 	XHCI_TRB_TYPE_NORMAL,
 	XHCI_TRB_TYPE_SETUP_STAGE,
@@ -58,5 +60,7 @@
 	XHCI_TRB_TYPE_NO_OP,
 
-// Command ring:
+	/*
+	 * Command ring:
+	 */
 	XHCI_TRB_TYPE_ENABLE_SLOT_CMD,
 	XHCI_TRB_TYPE_DISABLE_SLOT_CMD,
@@ -74,7 +78,11 @@
 	XHCI_TRB_TYPE_FORCE_HEADER_CMD,
 	XHCI_TRB_TYPE_NO_OP_CMD,
-// Reserved: 24-31
-
-// Event ring:
+	/*
+	 * Reserved: 24-31
+	*/
+
+	/*
+	 * Event ring:
+	 */
 	XHCI_TRB_TYPE_TRANSFER_EVENT = 32,
 	XHCI_TRB_TYPE_COMMAND_COMPLETION_EVENT,