HID: extend mask for BUTTON usage page
authorJiri Kosina <jkosina@suse.cz>
Wed, 17 Feb 2010 08:36:35 +0000 (09:36 +0100)
committerJiri Kosina <jkosina@suse.cz>
Wed, 17 Feb 2010 08:36:35 +0000 (09:36 +0100)
Now that joystick button usages can expand over 15 buttons, we
have to properly mask out the code from hid usage to cover the
whole 0xffff available space.

Reported-by: Stefan Bader <stefan.bader@canonical.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
drivers/hid/hid-input.c

index a01a1b0de1c313d3fc45735943f3a0bd0442ce9e..79d9edd0bdfa489cd075164d36464a15e6267b92 100644 (file)
@@ -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: