Index: uspace/drv/bus/usb/usbhub/usbhub.c
===================================================================
--- uspace/drv/bus/usb/usbhub/usbhub.c	(revision ea6de35e8a0d6a57a069013d6437a9e480208432)
+++ uspace/drv/bus/usb/usbhub/usbhub.c	(revision 75eb67352a7fbb34d1c1a35ee9bb055fbfa536ad)
@@ -248,9 +248,10 @@
 	/* Get hub descriptor. */
 	usb_log_debug("Retrieving descriptor\n");
+	usb_pipe_t *control_pipe = &hub_info->usb_device->ctrl_pipe;
 	uint8_t serialized_descriptor[USB_HUB_MAX_DESCRIPTOR_SIZE];
 	int opResult;
 
 	size_t received_size;
-	opResult = usb_request_get_descriptor(hub_info->control_pipe,
+	opResult = usb_request_get_descriptor(control_pipe,
 	    USB_REQUEST_TYPE_CLASS, USB_REQUEST_RECIPIENT_DEVICE,
 	    USB_DESCTYPE_HUB, 0, 0, serialized_descriptor,
@@ -296,6 +297,5 @@
 			usb_log_debug("Powering port %zu.\n", port);
 			opResult = usb_hub_set_port_feature(
-			    hub_info->control_pipe,
-			    port, USB_HUB_FEATURE_PORT_POWER);
+			    control_pipe, port, USB_HUB_FEATURE_PORT_POWER);
 			if (opResult != EOK) {
 				usb_log_error("Cannot power on port %zu: %s.\n",
@@ -368,4 +368,5 @@
     usb_hub_status_t status)
 {
+	usb_pipe_t *control_pipe = &hub_info->usb_device->ctrl_pipe;
 	if (status & USB_HUB_STATUS_OVER_CURRENT) {
 		/* Over-current detected on one or all ports,
@@ -375,6 +376,5 @@
 		for (port = 1; port <= hub_info->port_count; ++port) {
 			const int opResult = usb_hub_clear_port_feature(
-			    hub_info->control_pipe, port,
-			    USB_HUB_FEATURE_PORT_POWER);
+			    control_pipe, port, USB_HUB_FEATURE_PORT_POWER);
 			if (opResult != EOK) {
 				usb_log_warning(
@@ -390,6 +390,5 @@
 		for (port = 1; port <= hub_info->port_count; ++port) {
 			const int opResult = usb_hub_set_port_feature(
-			    hub_info->control_pipe, port,
-			    USB_HUB_FEATURE_PORT_POWER);
+			    control_pipe, port, USB_HUB_FEATURE_PORT_POWER);
 			if (opResult != EOK) {
 				usb_log_warning(
@@ -413,5 +412,5 @@
 	assert(hub_info->usb_device);
 	usb_log_debug("Global interrupt on a hub\n");
-	usb_pipe_t *ctrlpipe = &hub_info->usb_device->ctrl_pipe;
+	usb_pipe_t *control_pipe = &hub_info->usb_device->ctrl_pipe;
 
 	usb_hub_status_t status;
@@ -419,6 +418,6 @@
 	/* NOTE: We can't use standard USB GET_STATUS request, because
 	 * hubs reply is 4byte instead of 2 */
-	const int opResult = usb_pipe_control_read(
-	    ctrlpipe, &get_hub_status_request, sizeof(get_hub_status_request),
+	const int opResult = usb_pipe_control_read(control_pipe,
+	    &get_hub_status_request, sizeof(get_hub_status_request),
 	    &status, sizeof(usb_hub_status_t), &rcvd_size);
 	if (opResult != EOK) {
@@ -450,6 +449,6 @@
 		 * Just ACK the change.
 		 */
-		const int opResult = usb_hub_clear_feature(ctrlpipe,
-		    USB_HUB_FEATURE_C_HUB_LOCAL_POWER);
+		const int opResult = usb_hub_clear_feature(
+		    control_pipe, USB_HUB_FEATURE_C_HUB_LOCAL_POWER);
 		if (opResult != EOK) {
 			usb_log_error("Cannot clear hub power change flag: "