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

Commit b8691fd2 authored by Johann Deneux's avatar Johann Deneux Committed by Dmitry Torokhov
Browse files

Input: iforce - fix force feedback not working 



Use an interrupt URB to send force-feedback data to the device
instead of a bulk URB. This was broken since 2.6.18.

Signed-off-by: default avatarJohann Deneux <johann.deneux@gmail.com>
Signed-off-by: default avatarDmitry Torokhov <dtor@mail.ru>
parent 7d7b33d6

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

+3 −2
Original line number Diff line number Diff line
@@ -65,6 +65,7 @@ void iforce_usb_xmit(struct iforce *iforce) 
	XMIT_INC(iforce->xmit.tail, n);



	if ( (n=usb_submit_urb(iforce->out, GFP_ATOMIC)) ) {

		clear_bit(IFORCE_XMIT_RUNNING, iforce->xmit_flags);

		warn("usb_submit_urb failed %d\n", n);

	}
@@ -163,8 +164,8 @@ static int iforce_usb_probe(struct usb_interface *intf, 
	usb_fill_int_urb(iforce->irq, dev, usb_rcvintpipe(dev, epirq->bEndpointAddress),

			iforce->data, 16, iforce_usb_irq, iforce, epirq->bInterval);



	usb_fill_bulk_urb(iforce->out, dev, usb_sndbulkpipe(dev, epout->bEndpointAddress),

			iforce + 1, 32, iforce_usb_out, iforce);

	usb_fill_int_urb(iforce->out, dev, usb_sndintpipe(dev, epout->bEndpointAddress),

			iforce + 1, 32, iforce_usb_out, iforce, epout->bInterval);



	usb_fill_control_urb(iforce->ctrl, dev, usb_rcvctrlpipe(dev, 0),

			(void*) &iforce->cr, iforce->edata, 16, iforce_usb_ctrl, iforce);