Index: uspace/drv/bus/usb/usbdiag/main.c
===================================================================
--- uspace/drv/bus/usb/usbdiag/main.c	(revision bd1fab905db16e6d737be9ed4df3aa55a91d42c0)
+++ uspace/drv/bus/usb/usbdiag/main.c	(revision 85bf12bae025fd54ef10740528488cbe5849d969)
@@ -175,10 +175,10 @@
 
 static const usb_endpoint_description_t *diag_endpoints[] = {
-	&intr_in_ep,
-	&intr_out_ep,
-	&bulk_in_ep,
-	&bulk_out_ep,
-	&isoch_in_ep,
-	&isoch_out_ep,
+	[USB_DIAG_EP_INTR_IN] = &intr_in_ep,
+	[USB_DIAG_EP_INTR_OUT] = &intr_out_ep,
+	[USB_DIAG_EP_BULK_IN] = &bulk_in_ep,
+	[USB_DIAG_EP_BULK_OUT] = &bulk_out_ep,
+	[USB_DIAG_EP_ISOCH_IN] = &isoch_in_ep,
+	[USB_DIAG_EP_ISOCH_OUT] = &isoch_out_ep,
 	NULL
 };
@@ -197,5 +197,5 @@
 	.name = NAME,
 	.ops = &diag_driver_ops,
-	.endpoints = diag_endpoints
+	.endpoints = &diag_endpoints[1] /* EPs are indexed from 1. */
 };