Index: uspace/drv/bus/usb/xhci/rh.c
===================================================================
--- uspace/drv/bus/usb/xhci/rh.c	(revision 9620a545d9cf4723bd1a65704744dfc37020bdbe)
+++ uspace/drv/bus/usb/xhci/rh.c	(revision d33dc7809b7808258a1810039579f6bbde654daf)
@@ -68,5 +68,5 @@
 	rh->hc = hc;
 	rh->max_ports = XHCI_REG_RD(hc->cap_regs, XHCI_CAP_MAX_PORTS);
-	rh->devices = (xhci_device_t **) calloc(rh->max_ports, sizeof(xhci_device_t *));
+	rh->devices_by_port = (xhci_device_t **) calloc(rh->max_ports, sizeof(xhci_device_t *));
 	rh->hc_device = device;
 
@@ -90,5 +90,5 @@
 	assert(rh->hc_device);
 
-	assert(rh->devices[port_id - 1] == NULL);
+	assert(rh->devices_by_port[port_id - 1] == NULL);
 
 	xhci_bus_t *bus = &rh->hc->bus;
@@ -126,5 +126,5 @@
 	fibril_mutex_lock(&rh->device.base.guard);
 	list_append(&dev->link, &rh->device.base.devices);
-	rh->devices[port_id - 1] = xhci_dev;
+	rh->devices_by_port[port_id - 1] = xhci_dev;
 	fibril_mutex_unlock(&rh->device.base.guard);
 
@@ -180,5 +180,5 @@
 
 	/* Find XHCI device by the port. */
-	xhci_device_t *dev = rh->devices[port_id - 1];
+	xhci_device_t *dev = rh->devices_by_port[port_id - 1];
 	if (!dev) {
 		/* Must be extraneous call. */
@@ -192,5 +192,5 @@
 	fibril_mutex_lock(&rh->device.base.guard);
 	list_remove(&dev->base.link);
-	rh->devices[port_id - 1] = NULL;
+	rh->devices_by_port[port_id - 1] = NULL;
 	fibril_mutex_unlock(&rh->device.base.guard);
 
@@ -358,5 +358,5 @@
 	usb_log_debug2("Called xhci_rh_fini().");
 
-	free(rh->devices);
+	free(rh->devices_by_port);
 
 	return EOK;
Index: uspace/drv/bus/usb/xhci/rh.h
===================================================================
--- uspace/drv/bus/usb/xhci/rh.h	(revision 9620a545d9cf4723bd1a65704744dfc37020bdbe)
+++ uspace/drv/bus/usb/xhci/rh.h	(revision d33dc7809b7808258a1810039579f6bbde654daf)
@@ -77,5 +77,5 @@
 
 	/* Device pointers connected to RH ports or NULL. (size is `max_ports`) */
-	xhci_device_t **devices;
+	xhci_device_t **devices_by_port;
 } xhci_rh_t;