From 904e72321a68297a9f1662994d45ec8bcfe86fa5 Mon Sep 17 00:00:00 2001 From: Przemo Firszt Date: Tue, 15 May 2012 19:32:25 +0100 Subject: [PATCH] --- yaml --- r: 305070 b: refs/heads/master c: 163a6ae19b8f6afc4ac4f60711b998a3c150b858 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/hid/hid-wacom.c | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 738951207634..ce809b9a3ed0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d13f5454e4acbbe2a470cc6743c2998cfcd607a8 +refs/heads/master: 163a6ae19b8f6afc4ac4f60711b998a3c150b858 diff --git a/trunk/drivers/hid/hid-wacom.c b/trunk/drivers/hid/hid-wacom.c index 29372edc31c0..4fc4eebe9784 100644 --- a/trunk/drivers/hid/hid-wacom.c +++ b/trunk/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;