Index: uspace/lib/usbhost/include/usb/host/endpoint.h
===================================================================
--- uspace/lib/usbhost/include/usb/host/endpoint.h	(revision 0206d350511d5ad74999ecd3b4f1abcea0463ba8)
+++ uspace/lib/usbhost/include/usb/host/endpoint.h	(revision 3cbc13810aff9f4cf30104fc6ba3bacf0af5eb1b)
@@ -60,6 +60,6 @@
 	/** USB device */
 	device_t *device;
-	/** USB address. */
-	usb_target_t target;
+	/** Enpoint number */
+	usb_endpoint_t endpoint;
 	/** Communication direction. */
 	usb_direction_t direction;
@@ -108,4 +108,5 @@
 	return item ? list_get_instance(item, endpoint_t, link) : NULL;
 }
+
 #endif
 
Index: uspace/lib/usbhost/include/usb/host/usb_transfer_batch.h
===================================================================
--- uspace/lib/usbhost/include/usb/host/usb_transfer_batch.h	(revision 0206d350511d5ad74999ecd3b4f1abcea0463ba8)
+++ uspace/lib/usbhost/include/usb/host/usb_transfer_batch.h	(revision 3cbc13810aff9f4cf30104fc6ba3bacf0af5eb1b)
@@ -55,6 +55,10 @@
 /** Structure stores additional data needed for communication with EP */
 typedef struct usb_transfer_batch {
+	/** Target for communication */
+	usb_target_t target;
+
 	/** Endpoint used for communication */
 	endpoint_t *ep;
+
 	/** Size reported to be sent */
 	size_t expected_size;
@@ -96,5 +100,5 @@
  */
 #define USB_TRANSFER_BATCH_ARGS(batch) \
-	(batch).ep->target.address, (batch).ep->target.endpoint, \
+	(batch).target.address, (batch).target.endpoint, \
 	usb_str_speed((batch).ep->speed), \
 	usb_str_transfer_type_short((batch).ep->transfer_type), \