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

Commit cc8a9d79 authored by Oliver Neukum's avatar Oliver Neukum Committed by Jiri Kosina
Browse files

HID: usbhid: discarded events don't abort idleness 



If an event is discarded the device stays idle.  Just reverse the order of
check and marking busy.

Found by code inspection.

Signed-off-by: default avatarOliver Neukum <oneukum@suse.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent dfa0c5fa

drivers/hid/usbhid/hid-core.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -274,10 +274,10 @@ static void hid_irq_in(struct urb *urb) 




	switch (urb->status) {

	switch (urb->status) {

	case 0:			/* success */

	case 0:			/* success */

		usbhid_mark_busy(usbhid);

		usbhid->retry_delay = 0;

		usbhid->retry_delay = 0;

		if ((hid->quirks & HID_QUIRK_ALWAYS_POLL) && !hid->open)

		if ((hid->quirks & HID_QUIRK_ALWAYS_POLL) && !hid->open)

			break;

			break;

		usbhid_mark_busy(usbhid);

		if (!test_bit(HID_RESUME_RUNNING, &usbhid->iofl)) {

		if (!test_bit(HID_RESUME_RUNNING, &usbhid->iofl)) {

			hid_input_report(urb->context, HID_INPUT_REPORT,

			hid_input_report(urb->context, HID_INPUT_REPORT,

					 urb->transfer_buffer,

					 urb->transfer_buffer,