Index: uspace/drv/bus/usb/usbhid/generic/hiddev.c
===================================================================
--- uspace/drv/bus/usb/usbhid/generic/hiddev.c	(revision 68dbe3e0c9fcbe5acd289a9b5f4b31ab29a0b672)
+++ uspace/drv/bus/usb/usbhid/generic/hiddev.c	(revision 49bd7ae269d452086f2ec89e5fa8cfded6f942da)
@@ -52,4 +52,6 @@
 	.direction = USB_DIRECTION_IN,
 	.interface_class = USB_CLASS_HID,
+	.interface_subclass = -1,
+	.interface_protocol = -1,
 	.flags = 0
 };
Index: uspace/drv/bus/usb/usbhid/usbhid.c
===================================================================
--- uspace/drv/bus/usb/usbhid/usbhid.c	(revision 68dbe3e0c9fcbe5acd289a9b5f4b31ab29a0b672)
+++ uspace/drv/bus/usb/usbhid/usbhid.c	(revision 49bd7ae269d452086f2ec89e5fa8cfded6f942da)
@@ -54,5 +54,5 @@
 
 /* Array of endpoints expected on the device, NULL terminated. */
-usb_endpoint_description_t *usb_hid_endpoints[USB_HID_POLL_EP_COUNT + 1] = {
+usb_endpoint_description_t *usb_hid_endpoints[] = {
 	&usb_hid_kbd_poll_endpoint_description,
 	&usb_hid_mouse_poll_endpoint_description,