This is a note to let you know that I've just added the patch titled Input: xpad - use proper endpoint type to the 3.10-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: input-xpad-use-proper-endpoint-type.patch and it can be found in the queue-3.10 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@xxxxxxxxxxxxxxx> know about it. >From a1f9a4072655843fc03186acbad65990cc05dd2d Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> Date: Tue, 25 Nov 2014 00:38:17 -0800 Subject: Input: xpad - use proper endpoint type From: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> commit a1f9a4072655843fc03186acbad65990cc05dd2d upstream. 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@xxxxxxxxxxxxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@xxxxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- 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 @@ -1002,9 +1002,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 Patches currently in stable-queue which might be from gregkh@xxxxxxxxxxxxxxxxxxx are queue-3.10/x86-require-exact-match-for-noxsave-command-line-option.patch queue-3.10/pptp-fix-stack-info-leak-in-pptp_getname.patch queue-3.10/nfsd4-fix-leak-of-inode-reference-on-delegation-failure.patch queue-3.10/rt2x00-do-not-align-payload-on-modern-h-w.patch queue-3.10/input-xpad-use-proper-endpoint-type.patch queue-3.10/target-don-t-call-tfo-write_pending-if-data_length-0.patch queue-3.10/alsa-usb-audio-add-ctrl-message-delay-quirk-for.patch queue-3.10/of-base-fix-powerpc-address-parsing-hack.patch queue-3.10/iser-target-handle-device_removal-event-on-network-portal-listener-correctly.patch queue-3.10/inetdevice-fixed-signed-integer-overflow.patch queue-3.10/arm-8216-1-xscale-correct-auxiliary-register-in-suspend-resume.patch queue-3.10/ipx-fix-locking-regression-in-ipx_sendmsg-and-ipx_recvmsg.patch queue-3.10/powerpc-pseries-honor-the-generic-no_64bit_msi-flag.patch queue-3.10/x86-mm-set-nx-across-entire-pmd-at-boot.patch queue-3.10/spi-dw-fix-dynamic-speed-change.patch queue-3.10/sparc64-fix-constraints-on-swab-helpers.patch queue-3.10/usb-ssu100-fix-overrun-error-reporting.patch queue-3.10/usb-xhci-don-t-start-a-halted-endpoint-before-its-new-dequeue-is-set.patch queue-3.10/usb-quirks-add-reset-resume-quirk-for-ms-wireless-laser-mouse-6000.patch queue-3.10/asoc-sgtl5000-fix-small_pop-bit-definition.patch queue-3.10/powerpc-pseries-fix-endiannes-issue-in-rtas-call-from-xmon.patch queue-3.10/iio-fix-iio_event_code_extract_dir-bit-mask.patch queue-3.10/uprobes-x86-fix-_tif_uprobe-vs-_tif_notify_resume.patch queue-3.10/ieee802154-fix-error-handling-in-ieee802154fake_probe.patch queue-3.10/usb-keyspan-fix-tty-line-status-reporting.patch queue-3.10/usb-keyspan-fix-overrun-error-reporting.patch queue-3.10/can-dev-avoid-calling-kfree_skb-from-interrupt-context.patch queue-3.10/pci-msi-add-device-flag-indicating-that-64-bit-msis-don-t-work.patch queue-3.10/x86_64-traps-stop-using-ist-for-ss.patch queue-3.10/x86_64-traps-fix-the-espfix64-df-fixup-and-rewrite-it-in-c.patch queue-3.10/nfsd-fix-slot-wake-up-race-in-the-nfsv4.1-callback-code.patch queue-3.10/mips-loongson-make-platform-serial-setup-always-built-in.patch queue-3.10/usb-serial-ftdi_sio-add-pids-for-matrix-orbital-products.patch queue-3.10/ipv4-fix-incorrect-error-code-when-adding-an-unreachable-route.patch queue-3.10/arm-8222-1-mvebu-enable-strex-backoff-delay.patch queue-3.10/mips-oprofile-fix-backtrace-on-64-bit-kernel.patch queue-3.10/qmi_wwan-add-support-for-hp-lt4112-lte-hspa-gobi-4g-modem.patch queue-3.10/srp-target-retry-when-qp-creation-fails-with-enomem.patch queue-3.10/x86_64-traps-rework-bad_iret.patch queue-3.10/can-esd_usb2-fix-memory-leak-on-disconnect.patch queue-3.10/bnx2fc-do-not-add-shared-skbs-to-the-fcoe_rx_list.patch queue-3.10/usb-serial-cp210x-add-ids-for-cel-meshconnect-usb-stick.patch queue-3.10/asoc-wm_adsp-avoid-attempt-to-free-buffers-that-might-still-be-in-use.patch -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html