Index: uspace/drv/usbhid/kbd/kbddev.c
===================================================================
--- uspace/drv/usbhid/kbd/kbddev.c	(revision 1775ebc62e3f1fe43ab64f79d88cf2437d7fffdd)
+++ uspace/drv/usbhid/kbd/kbddev.c	(revision 9b78020f900914b95047e29225a3b98c5fbd31bb)
@@ -694,5 +694,5 @@
 	while (field != NULL) {
 		usb_log_debug2("FIELD (%p) - VALUE(%d) USAGE(%u)\n", 
-		    field, field->value, field->value);
+		    field, field->value, field->usage);
 		
 		assert(i < kbd_dev->key_count);
@@ -709,5 +709,10 @@
 		 *       two parts of the Report somehow.
 		 */
-		kbd_dev->keys[i] = field->value;
+		if( field->value != 0 ) {
+			kbd_dev->keys[i] = field->usage;
+		}
+		else {
+			kbd_dev->keys[i] = 0;
+		}
 		usb_log_debug2("Saved %u. key usage %d\n", i, kbd_dev->keys[i]);
 		
