diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-02-17 09:36:44 +0100 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-02-17 09:36:44 +0100 |
| commit | ec8c12f17550855f44283f28300c6b8de0949ef1 (patch) | |
| tree | 34316f3368d591c761adc081c1e03ec96379dbea /drivers/hid | |
| parent | c05838bff67bff307529823d6896aaf6da5592d6 (diff) | |
| parent | 7f978b9bf535cbbd1ae8d9fbdd7c4f60ab38f260 (diff) | |
Merge branch 'upstream' into for-next
Diffstat (limited to 'drivers/hid')
| -rw-r--r-- | drivers/hid/hid-input.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c index a01a1b0de1c3..79d9edd0bdfa 100644 --- a/drivers/hid/hid-input.c +++ b/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: |