Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8493ecca authored by Benjamin Tissoires's avatar Benjamin Tissoires Committed by Jiri Kosina
Browse files

HID: uHID: fix excepted report type 



When uhid_get_report() or uhid_set_report() are called, they emit on the
char device a UHID_GET_REPORT or UHID_SET_REPORT message. Then, the
protocol says that the user space asnwers with UHID_GET_REPORT_REPLY
or UHID_SET_REPORT_REPLY.

Unfortunatelly, the current code waits for an event of type UHID_GET_REPORT
or UHID_SET_REPORT instead of the reply one.
Add 1 to UHID_GET_REPORT or UHID_SET_REPORT to actually wait for the
reply, and validate the reply.

Signed-off-by: default avatarBenjamin Tissoires <benjamin.tissoires@redhat.com>
Reviewed-by: default avatarDavid Herrmann <dh.herrmann@gmail.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent 76c7c491

drivers/hid/uhid.c

+1 −1
Original line number Diff line number Diff line
@@ -154,7 +154,7 @@ static int __uhid_report_queue_and_wait(struct uhid_device *uhid, 


	spin_lock_irqsave(&uhid->qlock, flags);

	*report_id = ++uhid->report_id;

	uhid->report_type = ev->type;

	uhid->report_type = ev->type + 1;

	uhid->report_running = true;

	uhid_queue(uhid, ev);

	spin_unlock_irqrestore(&uhid->qlock, flags);