Index: uspace/drv/bus/usb/usbhid/main.c
===================================================================
--- uspace/drv/bus/usb/usbhid/main.c	(revision b09096a6c598670eb227ec9fe4ee994511fb2b5d)
+++ uspace/drv/bus/usb/usbhid/main.c	(revision dcc10b8d4fc50bbaa4d3b1552b77166ddb580e5f)
@@ -179,5 +179,8 @@
 static int usb_hid_device_rem(usb_device_t *dev)
 {
-	return EOK;
+	// TODO: Stop device polling fibril
+	// TODO: Stop autorepeat fibril
+	// TODO: Call deinit
+	return ENOTSUP;
 }
 /*----------------------------------------------------------------------------*/
@@ -195,5 +198,5 @@
 		async_usleep(100000);
 		if (!tries--) {
-			usb_log_error("Can't remove hub, still running.\n");
+			usb_log_error("Can't remove hid, still running.\n");
 			return EBUSY;
 		}
Index: uspace/drv/bus/usb/usbmast/main.c
===================================================================
--- uspace/drv/bus/usb/usbmast/main.c	(revision b09096a6c598670eb227ec9fe4ee994511fb2b5d)
+++ uspace/drv/bus/usb/usbmast/main.c	(revision dcc10b8d4fc50bbaa4d3b1552b77166ddb580e5f)
@@ -114,4 +114,5 @@
 {
 	//TODO: flush buffers, or whatever.
+	//TODO: remove device
 	return ENOTSUP;
 }