Index: uspace/drv/hid/usbhid/kbd/kbddev.c
===================================================================
--- uspace/drv/hid/usbhid/kbd/kbddev.c	(revision eed4139909f4e93017245a6736941de6564db9fe)
+++ uspace/drv/hid/usbhid/kbd/kbddev.c	(revision 2ee0e4a1310e3fe2e6e7d1f090bbe5a5e0aa5bb3)
@@ -191,13 +191,13 @@
 		} else {
 			usb_log_error("%s: console session already set",
-			   __FUNCTION__);
+			    __FUNCTION__);
 			async_answer_0(icall_handle, ELIMIT);
 		}
 		break;
 	default:
-			usb_log_error("%s: Unknown method: %d.",
-			    __FUNCTION__, (int) method);
-			async_answer_0(icall_handle, EINVAL);
-			break;
+		usb_log_error("%s: Unknown method: %d.",
+		    __FUNCTION__, (int) method);
+		async_answer_0(icall_handle, EINVAL);
+		break;
 	}
 
@@ -236,16 +236,16 @@
 	while (field != NULL) {
 
-		if ((field->usage == USB_HID_LED_NUM_LOCK)
-		    && (kbd_dev->mods & KM_NUM_LOCK)){
+		if ((field->usage == USB_HID_LED_NUM_LOCK) &&
+		    (kbd_dev->mods & KM_NUM_LOCK)) {
 			field->value = 1;
 		}
 
-		if ((field->usage == USB_HID_LED_CAPS_LOCK)
-		    && (kbd_dev->mods & KM_CAPS_LOCK)){
+		if ((field->usage == USB_HID_LED_CAPS_LOCK) &&
+		    (kbd_dev->mods & KM_CAPS_LOCK)) {
 			field->value = 1;
 		}
 
-		if ((field->usage == USB_HID_LED_SCROLL_LOCK)
-		    && (kbd_dev->mods & KM_SCROLL_LOCK)){
+		if ((field->usage == USB_HID_LED_SCROLL_LOCK) &&
+		    (kbd_dev->mods & KM_SCROLL_LOCK)) {
 			field->value = 1;
 		}
@@ -253,5 +253,5 @@
 		field = usb_hid_report_get_sibling(
 		    &hid_dev->report, field, kbd_dev->led_path,
-		USB_HID_PATH_COMPARE_END | USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY,
+		    USB_HID_PATH_COMPARE_END | USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY,
 		    USB_HID_REPORT_TYPE_OUTPUT);
 	}
@@ -269,5 +269,5 @@
 	usb_log_debug("Output report buffer: %s",
 	    usb_debug_str_buffer(kbd_dev->output_buffer, kbd_dev->output_size,
-	        0));
+	    0));
 
 	rc = usbhid_req_set_report(
@@ -308,7 +308,7 @@
 static inline int usb_kbd_is_lock(unsigned int key_code)
 {
-	return (key_code == KC_NUM_LOCK
-	    || key_code == KC_SCROLL_LOCK
-	    || key_code == KC_CAPS_LOCK);
+	return (key_code == KC_NUM_LOCK ||
+	    key_code == KC_SCROLL_LOCK ||
+	    key_code == KC_CAPS_LOCK);
 }
 
@@ -437,5 +437,5 @@
 
 	errno_t ret =
-	   usb_hid_report_path_append_item(path, USB_HIDUT_PAGE_KEYBOARD, 0);
+	    usb_hid_report_path_append_item(path, USB_HIDUT_PAGE_KEYBOARD, 0);
 	if (ret != EOK) {
 		usb_log_error("Failed to append to hid/kbd report path.");
@@ -461,6 +461,5 @@
 		if (field->value != 0) {
 			kbd_dev->keys[i] = field->usage;
-		}
-		else {
+		} else {
 			kbd_dev->keys[i] = 0;
 		}
@@ -469,6 +468,6 @@
 		++i;
 		field = usb_hid_report_get_sibling(
-		    &hid_dev->report, field, path, USB_HID_PATH_COMPARE_END
-		        | USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY,
+		    &hid_dev->report, field, path, USB_HID_PATH_COMPARE_END |
+		    USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY,
 		    USB_HID_REPORT_TYPE_INPUT);
 	}
@@ -742,5 +741,6 @@
 	// FIXME - the fibril_mutex_is_locked may not cause
 	// fibril scheduling
-	while (fibril_mutex_is_locked(&kbd_dev->repeat_mtx)) {}
+	while (fibril_mutex_is_locked(&kbd_dev->repeat_mtx)) {
+	}
 
 	/* Free all buffers. */