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

Commit 97d4ebfe authored by Dmitry Torokhov's avatar Dmitry Torokhov
Browse files

Input: iforce - fix detection of USB devices 



Recent conversion to wait_event_interruptible_timeout() caused
USB detection routine erroneously report timeouts for perfectly
working devices.

Signed-off-by: default avatarDmitry Torokhov <dtor@mail.ru>
parent 275c6ce2

drivers/input/joystick/iforce/iforce-packets.c

+2 −2
Original line number Diff line number Diff line
@@ -167,9 +167,9 @@ void iforce_process_packet(struct iforce *iforce, u16 cmd, unsigned char *data, 
		iforce->expect_packet = 0;

		iforce->ecmd = cmd;

		memcpy(iforce->edata, data, IFORCE_MAX_LENGTH);

		wake_up(&iforce->wait);

	}

#endif

	wake_up(&iforce->wait);



	if (!iforce->type) {

		being_used--;
@@ -264,7 +264,7 @@ int iforce_get_id_packet(struct iforce *iforce, char *packet) 
		wait_event_interruptible_timeout(iforce->wait,

			iforce->ctrl->status != -EINPROGRESS, HZ);



		if (iforce->ctrl->status != -EINPROGRESS) {

		if (iforce->ctrl->status) {

			usb_unlink_urb(iforce->ctrl);

			return -1;

		}

drivers/input/joystick/iforce/iforce-usb.c

+0 −1
Original line number Diff line number Diff line
@@ -95,7 +95,6 @@ static void iforce_usb_irq(struct urb *urb, struct pt_regs *regs) 
		goto exit;

	}



	wake_up(&iforce->wait);

	iforce_process_packet(iforce,

		(iforce->data[0] << 8) | (urb->actual_length - 1), iforce->data + 1, regs);