diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-08-04 15:26:15 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-08-04 15:26:15 +0200 |
| commit | fc73697bd5bf4efe8b5b2b78ec09e00f967cd055 (patch) | |
| tree | 326d5f84b13938a12fb27468ef73db4faf43a44e /drivers/hid/hid-input.c | |
| parent | 1c5474a65bf15a4cb162dfff86d6d0b5a08a740c (diff) | |
| parent | 8c8b01c38a70661d663175d355fdea85ca082272 (diff) | |
| download | linux-fc73697bd5bf4efe8b5b2b78ec09e00f967cd055.tar.gz | |
Merge branch 'upstream' into for-linus
Conflicts: drivers/hid/hid-ids.h
Diffstat (limited to 'drivers/hid/hid-input.c')
| -rw-r--r-- | drivers/hid/hid-input.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c index 7a0d2e4661a1..6b10e5afe770 100644 --- a/drivers/hid/hid-input.c +++ b/drivers/hid/hid-input.c @@ -301,6 +301,9 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel case HID_UP_DIGITIZER: switch (usage->hid & 0xff) { + case 0x00: /* Undefined */ + goto ignore; + case 0x30: /* TipPressure */ if (!test_bit(BTN_TOUCH, input->keybit)) { device->quirks |= HID_QUIRK_NOTOUCH; |