Index: sys/dev/usb/controller/xhci.c
===================================================================
--- sys/dev/usb/controller/xhci.c	(revision 304569)
+++ sys/dev/usb/controller/xhci.c	(working copy)
@@ -1385,8 +1385,8 @@
 
 		hdev->state = XHCI_ST_ENABLED;
 
-		/* set configure mask to slot and EP0 */
-		xhci_configure_mask(udev, 3, 0);
+		/* set configure mask to slot */
+		xhci_configure_mask(udev, 1, 0);
 
 		/* configure input slot context structure */
 		err = xhci_configure_device(udev);
@@ -1419,6 +1419,9 @@
 		pepext->trb_running = 0;
 		USB_BUS_UNLOCK(udev->bus);
 
+		/* set configure mask to slot and EP0 */
+		xhci_configure_mask(udev, 3, 0);
+	
 		err = xhci_configure_endpoint(udev,
 		    &udev->ctrl_ep_desc, pepext,
 		    0, 1, 1, 0, mps, mps, USB_EP_MODE_DEFAULT);