Index: uspace/drv/usbhid/lgtch-ultrax/keymap.c
===================================================================
--- uspace/drv/usbhid/lgtch-ultrax/keymap.c	(revision 890961a0e4076c473c9f2dd133b7e4c6c3f586fa)
+++ uspace/drv/usbhid/lgtch-ultrax/keymap.c	(revision e67399ef1606651d887b3ccc2c7ddfd81c02f364)
@@ -55,22 +55,22 @@
 	[0xc] = KC_F6, /* Just for testing purposes */
 	
-	[0xb5] = 0,  /* Scan Next Track */
-	[0xb6] = 0,  /* Scan Previous Track */
-	[0xb7] = 0,  /* Stop */
-	[0xb8] = 0,  /* Eject */
-	[0xcd] = KC_F2,  /* Play/Pause */
-	[0xe2] = KC_F3,  /* Mute */
-	[0xe9] = KC_F5,  /* Volume Increment */
-	[0xea] = KC_F4,  /* Volume Decrement */
-	[0x183] = 0, /* AL Consumer Control Configuration */
-	[0x18a] = 0, /* AL Email Reader */
-	[0x192] = 0, /* AL Calculator */
-	[0x221] = 0, /* AC Search */
-	[0x223] = 0, /* AC Home */
-	[0x224] = 0, /* AC Back */
-	[0x225] = 0, /* AC Forward */
-	[0x226] = 0, /* AC Stop */
-	[0x227] = KC_F1, /* AC Refresh */
-	[0x22a] = KC_F6  /* AC Bookmarks */
+	[0xb5] = 0,       /* Scan Next Track */
+	[0xb6] = 0,       /* Scan Previous Track */
+	[0xb7] = 0,       /* Stop */
+	[0xb8] = 0,       /* Eject */
+	[0xcd] = KC_F2,   /* Play/Pause */
+	[0xe2] = KC_F3,   /* Mute */
+	[0xe9] = KC_F5,   /* Volume Increment */
+	[0xea] = KC_F4,   /* Volume Decrement */
+	[0x183] = 0,      /* AL Consumer Control Configuration */
+	[0x18a] = 0,      /* AL Email Reader */
+	[0x192] = 0,      /* AL Calculator */
+	[0x221] = 0,      /* AC Search */
+	[0x223] = 0,      /* AC Home */
+	[0x224] = 0,      /* AC Back */
+	[0x225] = 0,      /* AC Forward */
+	[0x226] = 0,      /* AC Stop */
+	[0x227] = KC_F1,  /* AC Refresh */
+	[0x22a] = KC_F6   /* AC Bookmarks */
 };
 
Index: uspace/drv/usbhid/lgtch-ultrax/lgtch-ultrax.c
===================================================================
--- uspace/drv/usbhid/lgtch-ultrax/lgtch-ultrax.c	(revision 890961a0e4076c473c9f2dd133b7e4c6c3f586fa)
+++ uspace/drv/usbhid/lgtch-ultrax/lgtch-ultrax.c	(revision e67399ef1606651d887b3ccc2c7ddfd81c02f364)
@@ -356,4 +356,11 @@
 	int rc = usb_hid_parse_report(hid_dev->report, buffer, buffer_size, 
 	    &report_id);
+	
+	if (rc != EOK) {
+		usb_log_warning(NAME "Error in usb_hid_parse_report(): %s\n", 
+		    str_error(rc));
+		return true;
+	}
+	
 	usb_hid_report_path_set_report_id(path, report_id);
 
@@ -383,9 +390,4 @@
 	usb_hid_report_path_free(path);
 	
-	if (rc != EOK) {
-		usb_log_warning(NAME "Error in usb_hid_boot_keyboard_input_report():"
-		    "%s\n", str_error(rc));
-	}
-	
 	return true;
 }