Index: uspace/drv/bus/usb/xhci/hc.c
===================================================================
--- uspace/drv/bus/usb/xhci/hc.c	(revision 03936831e237a5f5ba77718cd0633451f3a1514f)
+++ uspace/drv/bus/usb/xhci/hc.c	(revision 1252e8110bb3ea42f4ef3d85040d83785bb4d42b)
@@ -476,7 +476,5 @@
 		return xhci_schedule_control_transfer(hc, batch);
 	case USB_TRANSFER_ISOCHRONOUS:
-		/* TODO: Implement me. */
-		usb_log_error("Isochronous transfers are not yet implemented!");
-		return ENOTSUP;
+		return xhci_schedule_isochronous_transfer(hc, batch);
 	case USB_TRANSFER_BULK:
 		return xhci_schedule_bulk_transfer(hc, batch);
Index: uspace/drv/bus/usb/xhci/transfers.c
===================================================================
--- uspace/drv/bus/usb/xhci/transfers.c	(revision 03936831e237a5f5ba77718cd0633451f3a1514f)
+++ uspace/drv/bus/usb/xhci/transfers.c	(revision 1252e8110bb3ea42f4ef3d85040d83785bb4d42b)
@@ -144,9 +144,4 @@
 	}
 
-	xhci_endpoint_t *xhci_ep = xhci_endpoint_get(batch->ep);
-
-	uint8_t slot_id = xhci_ep->device->slot_id;
-	xhci_trb_ring_t* ring = hc->dcbaa_virt[slot_id].trs[batch->ep->target.endpoint];
-
 	usb_device_request_setup_packet_t* setup =
 		(usb_device_request_setup_packet_t*) batch->setup_buffer;
@@ -197,5 +192,5 @@
 		TRB_CTRL_SET_TRB_TYPE(trb_data, XHCI_TRB_TYPE_DATA_STAGE);
 
-		transfer->direction = REQUEST_TYPE_IS_DEVICE_TO_HOST(setup->request_type) 
+		transfer->direction = REQUEST_TYPE_IS_DEVICE_TO_HOST(setup->request_type)
 					? STAGE_IN : STAGE_OUT;
 		TRB_CTRL_SET_DIR(trb_data, transfer->direction);
@@ -214,4 +209,8 @@
 	TRB_CTRL_SET_TRB_TYPE(trb_status, XHCI_TRB_TYPE_STATUS_STAGE);
 	TRB_CTRL_SET_DIR(trb_status, get_status_direction_flag(&trb_setup, setup->request_type, setup->length));
+
+        xhci_endpoint_t *xhci_ep = xhci_endpoint_get(batch->ep);
+        uint8_t slot_id = xhci_ep->device->slot_id;
+        xhci_trb_ring_t* ring = hc->dcbaa_virt[slot_id].trs[batch->ep->target.endpoint];
 
 	uintptr_t dummy = 0;
@@ -238,10 +237,11 @@
 {
 	if (batch->setup_size) {
-		usb_log_warning("Setup packet present for a bulk transfer.");
-	}
-
-	xhci_endpoint_t *xhci_ep = xhci_endpoint_get(batch->ep);
-	uint8_t slot_id = xhci_ep->device->slot_id;
-	xhci_trb_ring_t* ring = hc->dcbaa_virt[slot_id].trs[batch->ep->target.endpoint];
+		usb_log_warning("Setup packet present for a bulk transfer. Ignored.");
+	}
+	if (batch->ep->transfer_type != USB_TRANSFER_BULK) {
+		/* This method only works for bulk transfers. */
+		usb_log_error("Attempted to schedule a bulk transfer to non bulk endpoint.");
+		return EINVAL;
+	}
 
 	xhci_transfer_t *transfer = xhci_transfer_alloc(batch);
@@ -265,4 +265,8 @@
 	TRB_CTRL_SET_TRB_TYPE(trb, XHCI_TRB_TYPE_NORMAL);
 
+	xhci_endpoint_t *xhci_ep = xhci_endpoint_get(batch->ep);
+	uint8_t slot_id = xhci_ep->device->slot_id;
+	xhci_trb_ring_t* ring = hc->dcbaa_virt[slot_id].trs[batch->ep->target.endpoint];
+
 	xhci_trb_ring_enqueue(ring, &trb, &transfer->interrupt_trb_phys);
 	list_append(&transfer->link, &hc->transfers);
@@ -276,10 +280,11 @@
 {
 	if (batch->setup_size) {
-		usb_log_warning("Setup packet present for a interrupt transfer.");
-	}
-
-	xhci_endpoint_t *xhci_ep = xhci_endpoint_get(batch->ep);
-	uint8_t slot_id = xhci_ep->device->slot_id;
-	xhci_trb_ring_t* ring = hc->dcbaa_virt[slot_id].trs[batch->ep->target.endpoint];
+		usb_log_warning("Setup packet present for a interrupt transfer. Ignored.");
+	}
+	if (batch->ep->transfer_type != USB_TRANSFER_INTERRUPT) {
+		/* This method only works for interrupt transfers. */
+		usb_log_error("Attempted to schedule a interrupt transfer to non interrupt endpoint.");
+		return EINVAL;
+	}
 
 	xhci_transfer_t *transfer = xhci_transfer_alloc(batch);
@@ -303,4 +308,8 @@
 	TRB_CTRL_SET_TRB_TYPE(trb, XHCI_TRB_TYPE_NORMAL);
 
+	xhci_endpoint_t *xhci_ep = xhci_endpoint_get(batch->ep);
+	uint8_t slot_id = xhci_ep->device->slot_id;
+	xhci_trb_ring_t* ring = hc->dcbaa_virt[slot_id].trs[batch->ep->target.endpoint];
+
 	xhci_trb_ring_enqueue(ring, &trb, &transfer->interrupt_trb_phys);
 	list_append(&transfer->link, &hc->transfers);
@@ -308,4 +317,20 @@
 	const uint8_t target = xhci_endpoint_index(xhci_ep) + 1; /* EP Doorbells start at 1 */
 	return hc_ring_doorbell(hc, slot_id, target);
+}
+
+int xhci_schedule_isochronous_transfer(xhci_hc_t* hc, usb_transfer_batch_t* batch)
+{
+	if (batch->setup_size) {
+		usb_log_warning("Setup packet present for a isochronous transfer. Ignored.");
+	}
+	if (batch->ep->transfer_type != USB_TRANSFER_ISOCHRONOUS) {
+		/* This method only works for isochronous transfers. */
+		usb_log_error("Attempted to schedule a isochronous transfer to non isochronous endpoint.");
+		return EINVAL;
+	}
+
+        /* TODO: Implement me. */
+        usb_log_error("Isochronous transfers are not yet implemented!");
+        return ENOTSUP;
 }
 
Index: uspace/drv/bus/usb/xhci/transfers.h
===================================================================
--- uspace/drv/bus/usb/xhci/transfers.h	(revision 03936831e237a5f5ba77718cd0633451f3a1514f)
+++ uspace/drv/bus/usb/xhci/transfers.h	(revision 1252e8110bb3ea42f4ef3d85040d83785bb4d42b)
@@ -50,8 +50,12 @@
 int xhci_init_transfers(xhci_hc_t*);
 void xhci_fini_transfers(xhci_hc_t*);
+
 xhci_transfer_t* xhci_transfer_alloc(usb_transfer_batch_t*);
 void xhci_transfer_fini(xhci_transfer_t*);
+
+int xhci_handle_transfer_event(xhci_hc_t*, xhci_trb_t*);
+
 int xhci_schedule_control_transfer(xhci_hc_t*, usb_transfer_batch_t*);
 int xhci_schedule_bulk_transfer(xhci_hc_t*, usb_transfer_batch_t*);
 int xhci_schedule_interrupt_transfer(xhci_hc_t*, usb_transfer_batch_t*);
-int xhci_handle_transfer_event(xhci_hc_t*, xhci_trb_t*);
+int xhci_schedule_isochronous_transfer(xhci_hc_t* , usb_transfer_batch_t* );