Index: uspace/lib/usbdev/src/devdrv.c
===================================================================
--- uspace/lib/usbdev/src/devdrv.c	(revision 8a01a0b98199d1f7f8f7829b048fec35603be0ce)
+++ uspace/lib/usbdev/src/devdrv.c	(revision 6883abfa0e2bb564d2da375c57df0a6dab5b9297)
@@ -201,19 +201,12 @@
  *
  * @param dev Device where to destroy the pipes.
- * @return Error code.
- */
-static int destroy_current_pipes(usb_device_t *dev)
-{
-	const int rc = usb_device_destroy_pipes(dev->pipes, dev->pipes_count);
-	if (rc != EOK) {
-		return rc;
-	}
-
+ */
+static void destroy_current_pipes(usb_device_t *dev)
+{
+	usb_device_destroy_pipes(dev->pipes, dev->pipes_count);
 	dev->pipes = NULL;
 	dev->pipes_count = 0;
-
-	return EOK;
-}
-
+}
+/*----------------------------------------------------------------------------*/
 /** Change interface setting of a device.
  * This function selects new alternate setting of an interface by issuing
@@ -248,8 +241,5 @@
 
 	/* Destroy existing pipes. */
-	rc = destroy_current_pipes(dev);
-	if (rc != EOK) {
-		return rc;
-	}
+	destroy_current_pipes(dev);
 
 	/* Change the interface itself. */
@@ -422,14 +412,9 @@
  * @param[in] pipes_count Number of endpoints.
  */
-int usb_device_destroy_pipes(usb_endpoint_mapping_t *pipes, size_t pipes_count)
-{
-	if (pipes_count == 0) {
-		assert(pipes == NULL);
-		return EOK;
-	}
-	assert(pipes != NULL);
-
+void usb_device_destroy_pipes(usb_endpoint_mapping_t *pipes, size_t pipes_count)
+{
 	/* Destroy the pipes. */
 	for (size_t i = 0; i < pipes_count; ++i) {
+		assert(pipes);
 		usb_log_debug2("Unregistering pipe %zu: %spresent.\n",
 		    i, pipes[i].present ? "" : "not ");
@@ -437,8 +422,5 @@
 			usb_pipe_unregister(&pipes[i].pipe);
 	}
-
 	free(pipes);
-
-	return EOK;
 }