diff options
| author | Otavio Salvador <otavio@ossystems.com.br> | 2020-11-08 18:26:20 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-08 18:26:20 -0300 |
| commit | ad4c64e47c85a8e6d16ab61aa45d4bd4b645228d (patch) | |
| tree | 29ea6fbe4dacfd49723f265950c186fbca9736ca /drivers/hid/wacom_wac.c | |
| parent | 90064bcbaaf162090c50cd136687159ace347a90 (diff) | |
| parent | 32fa65b1d7d22ef7a185a3c89283c89aa532d83b (diff) | |
Merge pull request #167 from zandrey/5.4-2.1.x-imx
Update 5.4-2.1.x-imx to v5.4.75 from stable
Diffstat (limited to 'drivers/hid/wacom_wac.c')
| -rw-r--r-- | drivers/hid/wacom_wac.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/hid/wacom_wac.c b/drivers/hid/wacom_wac.c index 1c96809b51c9..b74acbd5997b 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); |