1 files changed, 7 insertions, 6 deletions

diff --git a/sys/dev/usb/usb_hid.c b/sys/dev/usb/usb_hid.c
index 3082749f1b1c..3008184a0417 100644
--- a/sys/dev/usb/usb_hid.c
+++ b/sys/dev/usb/usb_hid.c
@@ -283,14 +283,15 @@ hid_get_item(struct hid_data *s, struct hid_item *h)
 					 */
 					c->loc.count = 1;
 				} else {
-					/* make sure we have a usage */
-					if (s->nusage == 0) {
-						s->usages_min[s->nusage] = 0;
-						s->usages_max[s->nusage] = 0;
-						s->nusage = 1;
-					}
 					s->ncount = 1;
 				}
+				/* make sure we have a usage */
+				if (s->nusage == 0) {
+					/* use the undefined HID PAGE */
+					s->usages_min[s->nusage] = 0x0000;
+					s->usages_max[s->nusage] = 0xFFFF;
+					s->nusage = s->ncount;
+				}
 				goto top;
 
 			case 9:	/* Output */