diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-02-17 14:14:02 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-02-17 14:14:02 -0800 |
| commit | 71c7e32cd1509d46be836ed19dfe63e217eae8d4 (patch) | |
| tree | cb9860354fc65fdfa4fa2fc1d3474778bc7c6add | |
| parent | 56b7f5d90856ead67c6619772f7e1e739cba1597 (diff) | |
| download | patches-71c7e32cd1509d46be836ed19dfe63e217eae8d4.tar.gz | |
xpad patch upstream now
| -rw-r--r-- | csdio2.patch | 2 | ||||
| -rw-r--r-- | input-xpad-use-proper-endpoint-type.patch | 46 | ||||
| -rw-r--r-- | series | 13 |
3 files changed, 7 insertions, 54 deletions
diff --git a/csdio2.patch b/csdio2.patch index 903429984989dd..19a1b9407ba921 100644 --- a/csdio2.patch +++ b/csdio2.patch @@ -1391,7 +1391,7 @@ Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> +#endif --- a/include/uapi/linux/Kbuild +++ b/include/uapi/linux/Kbuild -@@ -88,6 +88,7 @@ header-y += coff.h +@@ -89,6 +89,7 @@ header-y += coff.h header-y += connector.h header-y += const.h header-y += cramfs_fs.h diff --git a/input-xpad-use-proper-endpoint-type.patch b/input-xpad-use-proper-endpoint-type.patch deleted file mode 100644 index 4da3d7a03b0b99..00000000000000 --- a/input-xpad-use-proper-endpoint-type.patch +++ /dev/null @@ -1,46 +0,0 @@ -From foo@baz Wed Jan 29 10:20:37 PST 2014 -Date: Wed, 29 Jan 2014 10:20:37 -0800 -To: Greg KH <gregkh@linuxfoundation.org> -From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> -Subject: [PATCH] Input: xpad: use proper endpoint type - -From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> - -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> ---- - drivers/input/joystick/xpad.c | 16 +++++++++++++--- - 1 file changed, 13 insertions(+), 3 deletions(-) - ---- a/drivers/input/joystick/xpad.c -+++ b/drivers/input/joystick/xpad.c -@@ -1179,9 +1179,19 @@ static int xpad_probe(struct usb_interfa - } - - ep_irq_in = &intf->cur_altsetting->endpoint[1].desc; -- usb_fill_bulk_urb(xpad->bulk_out, udev, -- usb_sndbulkpipe(udev, ep_irq_in->bEndpointAddress), -- xpad->bdata, XPAD_PKT_LEN, xpad_bulk_out, xpad); -+ if (usb_endpoint_is_bulk_out(ep_irq_in)) { -+ usb_fill_bulk_urb(xpad->bulk_out, udev, -+ 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 @@ -1,12 +1,11 @@ csdio2.patch -input-xpad-use-proper-endpoint-type.patch input-xpad-set-the-leds-properly-on-xbox-wireless-controllers.patch -#defer-input-nodes-and-led-support -#input-xpad-move-the-input-device-creation-to-a-new-function.patch -#input-xpad-set-the-correct-led-number.patch -#input-xpad-disconnect-all-wireless-controllers-at-init.patch -#input-xpad-handle-present-and-gone-correctly.patch -#input-xpad-properly-name-the-led-class-devices.patch +defer-input-nodes-and-led-support +input-xpad-move-the-input-device-creation-to-a-new-function.patch +input-xpad-set-the-correct-led-number.patch +input-xpad-disconnect-all-wireless-controllers-at-init.patch +input-xpad-handle-present-and-gone-correctly.patch +input-xpad-properly-name-the-led-class-devices.patch staging-exfat-add-filesystem-to-drivers-staging-exfat.patch |