Index: uspace/drv/char/i8042/i8042.c
===================================================================
--- uspace/drv/char/i8042/i8042.c	(revision 19e00de4765ba9c807a29e83bfd1c8fae4e3e3bf)
+++ uspace/drv/char/i8042/i8042.c	(revision c6c5ff3b46c0cf4ba85b55c1e816e8e602fa609c)
@@ -146,8 +146,10 @@
 	const uint8_t status = IPC_GET_ARG1(*call);
 	const uint8_t data = IPC_GET_ARG2(*call);
-	char ** buffer = (status & i8042_AUX_DATA) ?
-	    &controller->aux_buffer : &controller->kbd_buffer;
-	char * buffer_end = (status & i8042_AUX_DATA) ?
-	    controller->aux_buffer_end : controller->kbd_buffer_end;
+	const bool aux = (status & i8042_AUX_DATA);
+	char ** buffer =
+	    aux ? &controller->aux_buffer : &controller->kbd_buffer;
+	char * buffer_end =
+	    aux ? controller->aux_buffer_end : controller->kbd_buffer_end;
+
 	if (*buffer != NULL && *buffer < buffer_end) {
 		*(*buffer) = data;
@@ -156,5 +158,5 @@
 	} else {
 		ddf_msg(LVL_WARN, "Unhandled %s data: %hhx , status: %hhx.",
-		    (status & i8042_AUX_DATA) ? "AUX" : "KBD", data, status);
+		    aux ? "AUX" : "KBD", data, status);
 	}
 
@@ -322,4 +324,5 @@
 	controller->kbd_buffer = buffer;
 	controller->kbd_buffer_end = buffer + size;
+
 	/* Wait for buffer to be filled */
 	while (controller->kbd_buffer != controller->kbd_buffer_end)
@@ -363,4 +366,5 @@
 	controller->aux_buffer = buffer;
 	controller->aux_buffer_end = buffer + size;
+
 	/* Wait for buffer to be filled */
 	while (controller->aux_buffer != controller->aux_buffer_end)