Index: uspace/drv/uhci-hcd/iface.c
===================================================================
--- uspace/drv/uhci-hcd/iface.c	(revision f96aefc04871ee6f0c02107deb7c649a5cac64e7)
+++ uspace/drv/uhci-hcd/iface.c	(revision 6cd7b17d7b8173031c30f078ffcbd87ec20b2e01)
@@ -166,5 +166,5 @@
     usbhc_iface_transfer_out_callback_t callback, void *arg)
 {
-	usb_log_warning("Using deprecated API control write setup.\n");
+	usb_log_warning("Using deprecated API %s.\n", __FUNCTION__);
 	tracker_t *tracker = tracker_get(dev, target, USB_TRANSFER_CONTROL,
 	    8, FULL_SPEED, data, size, NULL, callback, arg);
@@ -179,4 +179,5 @@
     usbhc_iface_transfer_out_callback_t callback, void *arg)
 {
+	usb_log_warning("Using deprecated API %s.\n", __FUNCTION__);
 	tracker_t *tracker = tracker_get(dev, target, USB_TRANSFER_CONTROL,
 	    size, FULL_SPEED, data, size, NULL, callback, arg);
@@ -190,4 +191,5 @@
     usbhc_iface_transfer_in_callback_t callback, void *arg)
 {
+	usb_log_warning("Using deprecated API %s.\n", __FUNCTION__);
 	tracker_t *tracker = tracker_get(dev, target, USB_TRANSFER_CONTROL,
 	    0, FULL_SPEED, NULL, 0, callback, NULL, arg);
@@ -202,5 +204,5 @@
     usbhc_iface_transfer_out_callback_t callback, void *arg)
 {
-	usb_log_warning("Using deprecated API control read setup.\n");
+	usb_log_warning("Using deprecated API %s.\n", __FUNCTION__);
 	tracker_t *tracker = tracker_get(dev, target, USB_TRANSFER_CONTROL,
 	    8, FULL_SPEED, data, size, NULL, callback, arg);
@@ -215,4 +217,5 @@
     usbhc_iface_transfer_in_callback_t callback, void *arg)
 {
+	usb_log_warning("Using deprecated API %s.\n", __FUNCTION__);
 	tracker_t *tracker = tracker_get(dev, target, USB_TRANSFER_CONTROL,
 	    size, FULL_SPEED, data, size, callback, NULL, arg);
@@ -226,4 +229,5 @@
     usbhc_iface_transfer_out_callback_t callback, void *arg)
 {
+	usb_log_warning("Using deprecated API %s.\n", __FUNCTION__);
 	tracker_t *tracker = tracker_get(dev, target, USB_TRANSFER_CONTROL,
 	    0, FULL_SPEED, NULL, 0, NULL, callback, arg);
Index: uspace/drv/uhci-hcd/uhci.h
===================================================================
--- uspace/drv/uhci-hcd/uhci.h	(revision f96aefc04871ee6f0c02107deb7c649a5cac64e7)
+++ uspace/drv/uhci-hcd/uhci.h	(revision 6cd7b17d7b8173031c30f078ffcbd87ec20b2e01)
@@ -72,5 +72,5 @@
 
 #define UHCI_FRAME_LIST_COUNT 1024
-#define UHCI_CLEANER_TIMEOUT 10000
+#define UHCI_CLEANER_TIMEOUT 1000
 #define UHCI_DEBUGER_TIMEOUT 5000000