Index: uspace/lib/usbdev/src/devpoll.c
===================================================================
--- uspace/lib/usbdev/src/devpoll.c	(revision 4172db4a96dfc0e1f3850dc329bf5af934e31f20)
+++ uspace/lib/usbdev/src/devpoll.c	(revision 4287578d68345427074ec637c9ce9239daef2989)
@@ -154,7 +154,6 @@
 			 * attempt anyway.
 			 */
-			usb_request_clear_endpoint_halt(
-			    usb_device_get_default_pipe(polling->device),
-			    pipe->desc.endpoint_no);
+			usb_pipe_clear_halt(
+			    usb_device_get_default_pipe(polling->device), pipe);
 		}
 
Index: uspace/lib/usbdev/src/pipes.c
===================================================================
--- uspace/lib/usbdev/src/pipes.c	(revision 4172db4a96dfc0e1f3850dc329bf5af934e31f20)
+++ uspace/lib/usbdev/src/pipes.c	(revision 4287578d68345427074ec637c9ce9239daef2989)
@@ -56,5 +56,5 @@
 	/* Prevent infinite recursion. */
 	pipe->auto_reset_halt = false;
-	usb_request_clear_endpoint_halt(pipe, 0);
+	usb_pipe_clear_halt(pipe, pipe);
 	pipe->auto_reset_halt = true;
 }
@@ -194,5 +194,5 @@
 		exch = async_exchange_begin(pipe->isoch_session);
 	else
-	 	exch = async_exchange_begin(pipe->bus_session);
+		exch = async_exchange_begin(pipe->bus_session);
 	size_t act_size = 0;
 	const int rc =
Index: uspace/lib/usbdev/src/request.c
===================================================================
--- uspace/lib/usbdev/src/request.c	(revision 4172db4a96dfc0e1f3850dc329bf5af934e31f20)
+++ uspace/lib/usbdev/src/request.c	(revision 4287578d68345427074ec637c9ce9239daef2989)
@@ -824,5 +824,5 @@
  * @return Error code.
  */
-int usb_request_clear_endpoint_halt(usb_pipe_t *pipe, uint16_t ep_index)
+static int usb_request_clear_endpoint_halt(usb_pipe_t *pipe, uint16_t ep_index)
 {
 	return usb_request_clear_feature(pipe,