Index: uspace/lib/usbhost/include/usb/host/endpoint.h
===================================================================
--- uspace/lib/usbhost/include/usb/host/endpoint.h	(revision ff14aede529e82477b19f7e9c2e101612709dd67)
+++ uspace/lib/usbhost/include/usb/host/endpoint.h	(revision d308687300a22e8f243cc258f82dfe687aa82cfa)
@@ -66,6 +66,4 @@
 	/** USB transfer type. */
 	usb_transfer_type_t transfer_type;
-	/** Communication speed. */
-	usb_speed_t speed;
 	/** Maximum size of data packets. */
 	size_t max_packet_size;
Index: uspace/lib/usbhost/include/usb/host/usb_transfer_batch.h
===================================================================
--- uspace/lib/usbhost/include/usb/host/usb_transfer_batch.h	(revision ff14aede529e82477b19f7e9c2e101612709dd67)
+++ uspace/lib/usbhost/include/usb/host/usb_transfer_batch.h	(revision d308687300a22e8f243cc258f82dfe687aa82cfa)
@@ -39,4 +39,5 @@
 #include <usb/usb.h>
 #include <usb/request.h>
+#include <usb/host/bus.h>
 #include <usbhc_iface.h>
 
@@ -99,5 +100,5 @@
 #define USB_TRANSFER_BATCH_ARGS(batch) \
 	(batch).target.address, (batch).target.endpoint, \
-	usb_str_speed((batch).ep->speed), \
+	usb_str_speed((batch).ep->device->speed), \
 	usb_str_transfer_type_short((batch).ep->transfer_type), \
 	usb_str_direction((batch).ep->direction), \
Index: uspace/lib/usbhost/src/bandwidth.c
===================================================================
--- uspace/lib/usbhost/src/bandwidth.c	(revision ff14aede529e82477b19f7e9c2e101612709dd67)
+++ uspace/lib/usbhost/src/bandwidth.c	(revision d308687300a22e8f243cc258f82dfe687aa82cfa)
@@ -36,4 +36,5 @@
 #include <usb/host/bandwidth.h>
 #include <usb/host/endpoint.h>
+#include <usb/host/bus.h>
 
 #include <assert.h>
@@ -42,7 +43,6 @@
 /** Calculate bandwidth that needs to be reserved for communication with EP.
  * Calculation follows USB 1.1 specification.
- * @param speed Device's speed.
- * @param type Type of the transfer.
- * @param size Number of byte to transfer.
+ * @param ep Registered endpoint
+ * @param size Number of bytes to transfer.
  * @param max_packet_size Maximum bytes in one packet.
  */
@@ -50,4 +50,5 @@
 {
 	assert(ep);
+	assert(ep->device);
 
 	const usb_transfer_type_t type = ep->transfer_type;
@@ -66,5 +67,5 @@
 	 * transaction, but I did not find text in USB spec to confirm this */
 	/* NOTE: All data packets will be considered to be max_packet_size */
-	switch (ep->speed)
+	switch (ep->device->speed)
 	{
 	case USB_SPEED_LOW: