Index: uspace/app/vuhid/device.c
===================================================================
--- uspace/app/vuhid/device.c	(revision 1433ecda9b732f3f185f902feb26826ec2496e03)
+++ uspace/app/vuhid/device.c	(revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed)
@@ -129,10 +129,10 @@
 
 	/* Check that we have not run out of available endpoints. */
-	if ((iface->in_data_size > 0)
-	    && (hid_data->in_endpoint_first_free >= VUHID_ENDPOINT_MAX)) {
+	if ((iface->in_data_size > 0) &&
+	    (hid_data->in_endpoint_first_free >= VUHID_ENDPOINT_MAX)) {
 		return ELIMIT;
 	}
-	if ((iface->out_data_size > 0)
-	    && (hid_data->out_endpoint_first_free >= VUHID_ENDPOINT_MAX)) {
+	if ((iface->out_data_size > 0) &&
+	    (hid_data->out_endpoint_first_free >= VUHID_ENDPOINT_MAX)) {
 		return ELIMIT;
 	}
@@ -192,6 +192,6 @@
 	descr_iface->length = sizeof(usb_standard_interface_descriptor_t);
 	descr_iface->descriptor_type = USB_DESCTYPE_INTERFACE;
-	descr_iface->interface_number
-	    = dev->descriptors->configuration->descriptor->interface_count;
+	descr_iface->interface_number =
+	    dev->descriptors->configuration->descriptor->interface_count;
 	descr_iface->alternate_setting = 0;
 	descr_iface->endpoint_count = ep_count;
@@ -230,6 +230,6 @@
 		descr_ep_in->length = sizeof(usb_standard_endpoint_descriptor_t);
 		descr_ep_in->descriptor_type = USB_DESCTYPE_ENDPOINT;
-		descr_ep_in->endpoint_address
-		    = 0x80 | hid_data->in_endpoint_first_free;
+		descr_ep_in->endpoint_address =
+		    0x80 | hid_data->in_endpoint_first_free;
 		descr_ep_in->attributes = 3;
 		descr_ep_in->max_packet_size = iface->in_data_size;
@@ -246,6 +246,6 @@
 		descr_ep_out->length = sizeof(usb_standard_endpoint_descriptor_t);
 		descr_ep_out->descriptor_type = USB_DESCTYPE_ENDPOINT;
-		descr_ep_out->endpoint_address
-		    = 0x00 | hid_data->out_endpoint_first_free;
+		descr_ep_out->endpoint_address =
+		    0x00 | hid_data->out_endpoint_first_free;
 		descr_ep_out->attributes = 3;
 		descr_ep_out->max_packet_size = iface->out_data_size;
@@ -256,6 +256,6 @@
 	usbvirt_device_configuration_extras_t *extra_descriptors;
 	extra_descriptors = realloc(dev->descriptors->configuration->extra,
-	    sizeof(usbvirt_device_configuration_extras_t)
-	    * (dev->descriptors->configuration->extra_count + descr_count));
+	    sizeof(usbvirt_device_configuration_extras_t) *
+	    (dev->descriptors->configuration->extra_count + descr_count));
 	if (extra_descriptors == NULL) {
 		rc = ENOMEM;
@@ -300,25 +300,24 @@
 	 */
 	if (iface->in_data_size > 0) {
-		hid_data->in_endpoints_mapping[hid_data->in_endpoint_first_free]
-		    = iface;
-		dev->ops->data_in[hid_data->in_endpoint_first_free]
-		    = on_data_from_device;
+		hid_data->in_endpoints_mapping[hid_data->in_endpoint_first_free] =
+		    iface;
+		dev->ops->data_in[hid_data->in_endpoint_first_free] =
+		    on_data_from_device;
 		hid_data->in_endpoint_first_free++;
 	}
 	if (iface->out_data_size > 0) {
-		hid_data->out_endpoints_mapping[hid_data->out_endpoint_first_free]
-		    = iface;
-		dev->ops->data_out[hid_data->out_endpoint_first_free]
-		    = on_data_to_device;
+		hid_data->out_endpoints_mapping[hid_data->out_endpoint_first_free] =
+		    iface;
+		dev->ops->data_out[hid_data->out_endpoint_first_free] =
+		    on_data_to_device;
 		hid_data->out_endpoint_first_free++;
 	}
 
-	hid_data->interface_mapping[
-	    dev->descriptors->configuration->descriptor->interface_count]
-	    = iface;
+	hid_data->interface_mapping[dev->descriptors->configuration->descriptor->interface_count] =
+	    iface;
 
 	dev->descriptors->configuration->descriptor->interface_count++;
-	dev->descriptors->configuration->descriptor->total_length
-	    += total_descr_size;
+	dev->descriptors->configuration->descriptor->total_length +=
+	    total_descr_size;
 
 	hid_data->iface_count++;
Index: uspace/app/vuhid/stdreq.c
===================================================================
--- uspace/app/vuhid/stdreq.c	(revision 1433ecda9b732f3f185f902feb26826ec2496e03)
+++ uspace/app/vuhid/stdreq.c	(revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed)
@@ -50,6 +50,6 @@
 
 	if (setup_packet->value_high == USB_DESCTYPE_HID_REPORT) {
-		vuhid_interface_t *iface
-		    = vuhid->interface_mapping[setup_packet->index];
+		vuhid_interface_t *iface =
+		    vuhid->interface_mapping[setup_packet->index];
 		if (iface == NULL) {
 			return EFORWARD;