diff options
| author | Przemo Firszt | 2012-05-15 20:32:25 +0200 |
|---|---|---|
| committer | Jiri Kosina | 2012-05-16 21:42:15 +0200 |
| commit | 163a6ae19b8f6afc4ac4f60711b998a3c150b858 (patch) | |
| tree | a01e3764165e2804e6d87bc4daf818f0dba8680e /drivers/hid/hid-wacom.c | |
| parent | HID: wacom: Add LED selector control for Wacom Intuos4 WL (diff) | |
| download | kernel-qcow2-linux-163a6ae19b8f6afc4ac4f60711b998a3c150b858.tar.gz kernel-qcow2-linux-163a6ae19b8f6afc4ac4f60711b998a3c150b858.tar.xz kernel-qcow2-linux-163a6ae19b8f6afc4ac4f60711b998a3c150b858.zip | |
HID: wacom: Move Graphire raport header check.
That check is valid only for Wacom Graphire, as the device raports always
start with 0x03. Intuos4 WL high-speed raports begin with 0x04, so
the check would be filtering out valid reports.
Signed-off-by: Przemo Firszt <przemo@firszt.eu>
Acked-by: Ping Cheng <pingc@wacom.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid/hid-wacom.c')
| -rw-r--r-- | drivers/hid/hid-wacom.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/drivers/hid/hid-wacom.c b/drivers/hid/hid-wacom.c index 29372edc31c0..4fc4eebe9784 100644 --- a/drivers/hid/hid-wacom.c +++ b/drivers/hid/hid-wacom.c @@ -578,13 +578,15 @@ static int wacom_raw_event(struct hid_device *hdev, struct hid_report *report, hidinput = list_entry(hdev->inputs.next, struct hid_input, list); input = hidinput->input; - /* Check if this is a tablet report */ - if (data[0] != 0x03) - return 0; - switch (hdev->product) { case USB_DEVICE_ID_WACOM_GRAPHIRE_BLUETOOTH: - return wacom_gr_parse_report(hdev, wdata, input, data); + if (data[0] == 0x03) { + return wacom_gr_parse_report(hdev, wdata, input, data); + } else { + hid_err(hdev, "Unknown report: %d,%d size:%d\n", + data[0], data[1], size); + return 0; + } break; case USB_DEVICE_ID_WACOM_INTUOS4_BLUETOOTH: i = 1; |