Index: uspace/drv/bus/usb/usbhub/port.c
===================================================================
--- uspace/drv/bus/usb/usbhub/port.c	(revision a821f057270c2924477d104a1e97d85f64d5be69)
+++ uspace/drv/bus/usb/usbhub/port.c	(revision aa148b3fc2c439858fadc1cd45f0d361001f98cc)
@@ -82,5 +82,5 @@
 	}
 	
-	const int err = usbhc_device_remove(exch, port->port_number);
+	const errno_t err = usbhc_device_remove(exch, port->port_number);
 	if (err)
 		port_log(error, port, "Failed to remove device: %s", str_error(err));
@@ -224,5 +224,5 @@
 
 	if (!overcurrent) {
-		const int err = usb_hub_set_port_feature(port->hub, port->port_number, USB_HUB_FEATURE_PORT_POWER);
+		const errno_t err = usb_hub_set_port_feature(port->hub, port->port_number, USB_HUB_FEATURE_PORT_POWER);
 		if (err)
 			port_log(error, port, "Failed to set port power after OC: %s.", str_error(err));
@@ -272,5 +272,5 @@
 
 	usb_port_status_t status = 0;
-	const int err = usb_hub_get_port_status(port->hub, port->port_number, &status);
+	const errno_t err = usb_hub_get_port_status(port->hub, port->port_number, &status);
 	if (err != EOK) {
 		port_log(error, port, "Failed to get port status: %s.", str_error(err));
Index: uspace/drv/bus/usb/usbhub/usbhub.c
===================================================================
--- uspace/drv/bus/usb/usbhub/usbhub.c	(revision a821f057270c2924477d104a1e97d85f64d5be69)
+++ uspace/drv/bus/usb/usbhub/usbhub.c	(revision aa148b3fc2c439858fadc1cd45f0d361001f98cc)
@@ -127,5 +127,5 @@
 errno_t usb_hub_device_add(usb_device_t *usb_dev)
 {
-	int err;
+	errno_t err;
 	assert(usb_dev);
 
@@ -208,5 +208,5 @@
 	free(hub->ports);
 
-	const int ret = ddf_fun_unbind(hub->hub_fun);
+	const errno_t ret = ddf_fun_unbind(hub->hub_fun);
 	if (ret != EOK) {
 		usb_log_error("(%p) Failed to unbind '%s' function: %s.",
@@ -347,5 +347,5 @@
 	for (unsigned int port = 0; port < hub_dev->port_count; ++port) {
 		usb_log_debug("(%p): Powering port %u.", hub_dev, port + 1);
-		const int ret = usb_hub_set_port_feature(hub_dev, port + 1,
+		const errno_t ret = usb_hub_set_port_feature(hub_dev, port + 1,
 		    USB_HUB_FEATURE_PORT_POWER);
 
@@ -519,5 +519,5 @@
  * @param feature Feature selector.
  */
-int usb_hub_set_depth(const usb_hub_dev_t *hub)
+errno_t usb_hub_set_depth(const usb_hub_dev_t *hub)
 {
 	assert(hub);
@@ -544,5 +544,5 @@
  * @param feature Feature selector.
  */
-int usb_hub_set_port_feature(const usb_hub_dev_t *hub, size_t port_number,
+errno_t usb_hub_set_port_feature(const usb_hub_dev_t *hub, size_t port_number,
     usb_hub_class_feature_t feature)
 {
@@ -565,5 +565,5 @@
  * @param feature Feature selector.
  */
-int usb_hub_clear_port_feature(const usb_hub_dev_t *hub, size_t port_number,
+errno_t usb_hub_clear_port_feature(const usb_hub_dev_t *hub, size_t port_number,
     usb_hub_class_feature_t feature)
 {
@@ -587,5 +587,5 @@
  * @return Error code.
  */
-int usb_hub_get_port_status(const usb_hub_dev_t *hub, size_t port_number,
+errno_t usb_hub_get_port_status(const usb_hub_dev_t *hub, size_t port_number,
     usb_port_status_t *status)
 {
@@ -606,5 +606,5 @@
 
 	uint32_t buffer;
-	const int rc = usb_pipe_control_read(hub->control_pipe,
+	const errno_t rc = usb_pipe_control_read(hub->control_pipe,
 	    &request, sizeof(usb_device_request_setup_packet_t),
 	    &buffer, sizeof(buffer), &recv_size);
@@ -705,5 +705,5 @@
  * is connected with already attached devices.
  */
-int usb_hub_reserve_default_address(usb_hub_dev_t *hub, async_exch_t *exch,
+errno_t usb_hub_reserve_default_address(usb_hub_dev_t *hub, async_exch_t *exch,
     usb_port_t *port)
 {
@@ -713,5 +713,5 @@
 	assert(fibril_mutex_is_locked(&port->guard));
 
-	int err = usbhc_reserve_default_address(exch);
+	errno_t err = usbhc_reserve_default_address(exch);
 	/*
 	 * EINVAL signalls that its our hub (hopefully different port) that has
@@ -752,7 +752,7 @@
  * Release the default address from a port.
  */
-int usb_hub_release_default_address(usb_hub_dev_t *hub, async_exch_t *exch)
-{
-	const int ret = usbhc_release_default_address(exch);
+errno_t usb_hub_release_default_address(usb_hub_dev_t *hub, async_exch_t *exch)
+{
+	const errno_t ret = usbhc_release_default_address(exch);
 
 	/*