openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Input: xpad - use proper endpoint type 

The xpad wireless endpoint is not a bulk endpoint on my devices, but
rather an interrupt one, so the USB core complains when it is submitted.
I'm guessing that the author really did mean that this should be an
interrupt urb, but as there are a zillion different xpad devices out
there, let's cover out bases and handle both bulk and interrupt
endpoints just as easily.

Signed-off-by: "Pierre-Loup A. Griffais" <pgriffais@valvesoftware.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
This commit is contained in:
Greg Kroah-Hartman 2014-11-25 00:38:17 -08:00 committed by Dmitry Torokhov
parent d0ab54783f
commit a1f9a40726
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/input/joystick/xpad.c
View File

@ -1179,9 +1179,19 @@ static int xpad_probe(struct usb_interface *intf, const struct usb_device_id *id
} }
ep_irq_in = &intf->cur_altsetting->endpoint[1].desc; ep_irq_in = &intf->cur_altsetting->endpoint[1].desc;
usb_fill_bulk_urb(xpad->bulk_out, udev, if (usb_endpoint_is_bulk_out(ep_irq_in)) {
usb_sndbulkpipe(udev, ep_irq_in->bEndpointAddress), usb_fill_bulk_urb(xpad->bulk_out, udev,
xpad->bdata, XPAD_PKT_LEN, xpad_bulk_out, xpad); usb_sndbulkpipe(udev,
ep_irq_in->bEndpointAddress),
xpad->bdata, XPAD_PKT_LEN,
xpad_bulk_out, xpad);
} else {
usb_fill_int_urb(xpad->bulk_out, udev,
usb_sndintpipe(udev,
ep_irq_in->bEndpointAddress),
xpad->bdata, XPAD_PKT_LEN,
xpad_bulk_out, xpad, 0);
}
/* /*
* Submit the int URB immediately rather than waiting for open * Submit the int URB immediately rather than waiting for open