UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

HID: uclogic: Handle virtual frame reports 

Explicitly change report ID to virtual ID and handle virtual frame
reports as real for consistency.

Signed-off-by: Nikolai Kondrashov <spbnick@gmail.com>
Signed-off-by: José Expósito <jose.exposito89@gmail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
This commit is contained in:
Nikolai Kondrashov 2022-02-10 20:04:37 +01:00 committed by Jiri Kosina
parent fea53b9f15
commit 044fa8162d
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/hid/hid-uclogic-core.c
View File

@ -365,6 +365,7 @@ static int uclogic_raw_event(struct hid_device *hdev,
struct hid_report *report, struct hid_report *report,
u8 *data, int size) u8 *data, int size)
{ {
unsigned int report_id = report->id;
struct uclogic_drvdata *drvdata = hid_get_drvdata(hdev); struct uclogic_drvdata *drvdata = hid_get_drvdata(hdev);
struct uclogic_params *params = &drvdata->params; struct uclogic_params *params = &drvdata->params;
@ -374,20 +375,20 @@ static int uclogic_raw_event(struct hid_device *hdev,
/* Tweak pen reports, if necessary */ /* Tweak pen reports, if necessary */
if (!params->pen_unused && if (!params->pen_unused &&
(report->id == params->pen.id) && (report_id == params->pen.id) &&
(size >= 2)) { (size >= 2)) {
/* If it's the "virtual" frame controls report */ /* If it's the "virtual" frame controls report */
if (params->frame.id != 0 && if (params->frame.id != 0 &&
data[1] & params->pen_frame_flag) { data[1] & params->pen_frame_flag) {
/* Change to virtual frame controls report ID */ /* Change to virtual frame controls report ID */
data[0] = params->frame.id; report_id = data[0] = params->frame.id;
return 0; } else {
return uclogic_raw_event_pen(drvdata, data, size);
} }
return uclogic_raw_event_pen(drvdata, data, size);
} }
/* Tweak frame control reports, if necessary */ /* Tweak frame control reports, if necessary */
if (report->id == params->frame.id) if (report_id == params->frame.id)
return uclogic_raw_event_frame(drvdata, data, size); return uclogic_raw_event_frame(drvdata, data, size);
return 0; return 0;