aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/hid/wacom_wac.c
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2020-10-15 20:41:43 +0200
committerJiri Kosina <jkosina@suse.cz>2020-10-15 20:41:43 +0200
commit9b14b066796d0e8bd05f200f30cb4222f8c0f9f1 (patch)
treee5b3daf993db737ebd6a31f9829cc2d07091e33f /drivers/hid/wacom_wac.c
parent146f9d9189b153c3132429578554f3a7896081fc (diff)
parent505f394fa239cecb76d916aa858f87ed7ea7fde4 (diff)
downloadtip-9b14b066796d0e8bd05f200f30cb4222f8c0f9f1.tar.gz
tip-9b14b066796d0e8bd05f200f30cb4222f8c0f9f1.tar.xz
tip-9b14b066796d0e8bd05f200f30cb4222f8c0f9f1.zip
Merge branch 'for-5.9/upstream-fixes' into for-linus
- "heartbeat" report fix for several Wacom devices - Lenovo X1 Tablet support improvements - new device IDs - bounds checking fix in hid-roccat - stylus battery reporting fix
Diffstat (limited to 'drivers/hid/wacom_wac.c')
-rw-r--r--drivers/hid/wacom_wac.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/hid/wacom_wac.c b/drivers/hid/wacom_wac.c
index 83dfec327c42..1bd0eb71559c 100644
--- a/drivers/hid/wacom_wac.c
+++ b/drivers/hid/wacom_wac.c
@@ -2773,7 +2773,9 @@ static int wacom_wac_collection(struct hid_device *hdev, struct hid_report *repo
if (report->type != HID_INPUT_REPORT)
return -1;
- if (WACOM_PEN_FIELD(field) && wacom->wacom_wac.pen_input)
+ if (WACOM_PAD_FIELD(field))
+ return 0;
+ else if (WACOM_PEN_FIELD(field) && wacom->wacom_wac.pen_input)
wacom_wac_pen_report(hdev, report);
else if (WACOM_FINGER_FIELD(field) && wacom->wacom_wac.touch_input)
wacom_wac_finger_report(hdev, report);