Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

HID: wacom: generic: Correct pad syncing

Browse source 
commit d4b8efeb46d99a5d02e7f88ac4eaccbe49370770 upstream.

Only sync the pad once per report, not once per collection.
Also avoid syncing the pad on battery reports.

Fixes: f8b6a74719 ("HID: wacom: generic: Support multiple tools per report")
Cc: <stable@vger.kernel.org> # v4.17+
Signed-off-by: Aaron Armstrong Skomra <aaron.skomra@wacom.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Aaron Armstrong Skomra 2019-05-10 15:34:17 -07:00 committed by Greg Kroah-Hartman
parent 46f71a15ab
commit 1c871b4006
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
drivers/hid/wacom_wac.c
View file

@ -2119,14 +2119,12 @@ static void wacom_wac_pad_report(struct hid_device *hdev,
bool active = wacom_wac->hid_data.inrange_state != 0; bool active = wacom_wac->hid_data.inrange_state != 0;
/* report prox for expresskey events */ /* report prox for expresskey events */
if ((wacom_equivalent_usage(field->physical) == HID_DG_TABLETFUNCTIONKEY) && if (wacom_wac->hid_data.pad_input_event_flag) {
wacom_wac->hid_data.pad_input_event_flag) {
input_event(input, EV_ABS, ABS_MISC, active ? PAD_DEVICE_ID : 0); input_event(input, EV_ABS, ABS_MISC, active ? PAD_DEVICE_ID : 0);
input_sync(input); input_sync(input);
if (!active) if (!active)
wacom_wac->hid_data.pad_input_event_flag = false; wacom_wac->hid_data.pad_input_event_flag = false;
} }
} }
static void wacom_wac_pen_usage_mapping(struct hid_device *hdev, static void wacom_wac_pen_usage_mapping(struct hid_device *hdev,
@ -2723,9 +2721,7 @@ static int wacom_wac_collection(struct hid_device *hdev, struct hid_report *repo
if (report->type != HID_INPUT_REPORT) if (report->type != HID_INPUT_REPORT)
return -1; return -1;
if (WACOM_PAD_FIELD(field) && wacom->wacom_wac.pad_input) if (WACOM_PEN_FIELD(field) && wacom->wacom_wac.pen_input)
wacom_wac_pad_report(hdev, report, field);
else if (WACOM_PEN_FIELD(field) && wacom->wacom_wac.pen_input)
wacom_wac_pen_report(hdev, report); wacom_wac_pen_report(hdev, report);
else if (WACOM_FINGER_FIELD(field) && wacom->wacom_wac.touch_input) else if (WACOM_FINGER_FIELD(field) && wacom->wacom_wac.touch_input)
wacom_wac_finger_report(hdev, report); wacom_wac_finger_report(hdev, report);
@ -2739,7 +2735,7 @@ void wacom_wac_report(struct hid_device *hdev, struct hid_report *report)
struct wacom_wac *wacom_wac = &wacom->wacom_wac; struct wacom_wac *wacom_wac = &wacom->wacom_wac;
struct hid_field *field; struct hid_field *field;
bool pad_in_hid_field = false, pen_in_hid_field = false, bool pad_in_hid_field = false, pen_in_hid_field = false,
finger_in_hid_field = false; finger_in_hid_field = false, true_pad = false;
int r; int r;
int prev_collection = -1; int prev_collection = -1;
@ -2755,6 +2751,8 @@ void wacom_wac_report(struct hid_device *hdev, struct hid_report *report)
pen_in_hid_field = true; pen_in_hid_field = true;
if (WACOM_FINGER_FIELD(field)) if (WACOM_FINGER_FIELD(field))
finger_in_hid_field = true; finger_in_hid_field = true;
if (wacom_equivalent_usage(field->physical) == HID_DG_TABLETFUNCTIONKEY)
true_pad = true;
} }
wacom_wac_battery_pre_report(hdev, report); wacom_wac_battery_pre_report(hdev, report);
@ -2778,6 +2776,9 @@ void wacom_wac_report(struct hid_device *hdev, struct hid_report *report)
} }
wacom_wac_battery_report(hdev, report); wacom_wac_battery_report(hdev, report);
if (true_pad && wacom->wacom_wac.pad_input)
wacom_wac_pad_report(hdev, report, field);
} }
static int wacom_bpt_touch(struct wacom_wac *wacom) static int wacom_bpt_touch(struct wacom_wac *wacom)