Thread (8 messages) flat view 8 messages, 3 authors, 2012-05-17

Re: [PATCH 1/3] HID: wacom: Move Graphire raport header check.

From: Ping Cheng <hidden>
Date: 2012-05-16 16:20:05
Also in: lkml

On Tue, May 15, 2012 at 11:32 AM, Przemo Firszt [off-list ref] wrote:
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 <redacted>
Acked-by: Ping Cheng <redacted> for the series.

Ping
quoted hunk ↗ jump to hunk
---
 drivers/hid/hid-wacom.c |   12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/drivers/hid/hid-wacom.c b/drivers/hid/hid-wacom.c
index 29372ed..4fc4eeb 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;
--
1.7.10.1
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help