diff --git a/[refs] b/[refs]
index 17b04ede97a9..21cb33d13bf3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ff5cf34c809cd5950579e46e7c10c29bc647aaf1
+refs/heads/master: 7f978b9bf535cbbd1ae8d9fbdd7c4f60ab38f260
diff --git a/trunk/drivers/hid/hid-input.c b/trunk/drivers/hid/hid-input.c
index a01a1b0de1c3..79d9edd0bdfa 100644
--- a/trunk/drivers/hid/hid-input.c
+++ b/trunk/drivers/hid/hid-input.c
@@ -193,7 +193,7 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel
 		break;
 
 	case HID_UP_BUTTON:
-		code = ((usage->hid - 1) & 0xf);
+		code = ((usage->hid - 1) & HID_USAGE);
 
 		switch (field->application) {
 		case HID_GD_MOUSE: