From: Greg Kroah-Hartman Date: Mon, 28 Jan 2019 13:11:18 +0000 (+0100) Subject: 4.4-stable patches X-Git-Tag: v4.9.154~43 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=418148a7bc267e146eb8d51408869ed85e9b859b;p=thirdparty%2Fkernel%2Fstable-queue.git 4.4-stable patches added patches: input-xpad-add-support-for-steelseries-stratus-duo.patch --- diff --git a/queue-4.4/input-xpad-add-support-for-steelseries-stratus-duo.patch b/queue-4.4/input-xpad-add-support-for-steelseries-stratus-duo.patch new file mode 100644 index 00000000000..d51e75c5c48 --- /dev/null +++ b/queue-4.4/input-xpad-add-support-for-steelseries-stratus-duo.patch @@ -0,0 +1,43 @@ +From fe2bfd0d40c935763812973ce15f5764f1c12833 Mon Sep 17 00:00:00 2001 +From: Tom Panfil +Date: Fri, 11 Jan 2019 17:49:40 -0800 +Subject: Input: xpad - add support for SteelSeries Stratus Duo + +From: Tom Panfil + +commit fe2bfd0d40c935763812973ce15f5764f1c12833 upstream. + +Add support for the SteelSeries Stratus Duo, a wireless Xbox 360 +controller. The Stratus Duo ships with a USB dongle to enable wireless +connectivity, but it can also function as a wired controller by connecting +it directly to a PC via USB, hence the need for two USD PIDs. 0x1430 is the +dongle, and 0x1431 is the controller. + +Signed-off-by: Tom Panfil +Cc: stable@vger.kernel.org +Signed-off-by: Dmitry Torokhov +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/input/joystick/xpad.c | 3 +++ + 1 file changed, 3 insertions(+) + +--- a/drivers/input/joystick/xpad.c ++++ b/drivers/input/joystick/xpad.c +@@ -255,6 +255,8 @@ static const struct xpad_device { + { 0x0f30, 0x0202, "Joytech Advanced Controller", 0, XTYPE_XBOX }, + { 0x0f30, 0x8888, "BigBen XBMiniPad Controller", 0, XTYPE_XBOX }, + { 0x102c, 0xff0c, "Joytech Wireless Advanced Controller", 0, XTYPE_XBOX }, ++ { 0x1038, 0x1430, "SteelSeries Stratus Duo", 0, XTYPE_XBOX360 }, ++ { 0x1038, 0x1431, "SteelSeries Stratus Duo", 0, XTYPE_XBOX360 }, + { 0x11c9, 0x55f0, "Nacon GC-100XF", 0, XTYPE_XBOX360 }, + { 0x12ab, 0x0004, "Honey Bee Xbox360 dancepad", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX360 }, + { 0x12ab, 0x0301, "PDP AFTERGLOW AX.1", 0, XTYPE_XBOX360 }, +@@ -431,6 +433,7 @@ static const struct usb_device_id xpad_t + XPAD_XBOXONE_VENDOR(0x0e6f), /* 0x0e6f X-Box One controllers */ + XPAD_XBOX360_VENDOR(0x0f0d), /* Hori Controllers */ + XPAD_XBOXONE_VENDOR(0x0f0d), /* Hori Controllers */ ++ XPAD_XBOX360_VENDOR(0x1038), /* SteelSeries Controllers */ + XPAD_XBOX360_VENDOR(0x11c9), /* Nacon GC100XF */ + XPAD_XBOX360_VENDOR(0x12ab), /* X-Box 360 dance pads */ + XPAD_XBOX360_VENDOR(0x1430), /* RedOctane X-Box 360 controllers */ diff --git a/queue-4.4/series b/queue-4.4/series index 96f3e6dfc81..905ecc4263f 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -15,3 +15,4 @@ staging-rtl8188eu-add-device-code-for-d-link-dwa-121-rev-b1.patch tty-handle-problem-if-line-discipline-does-not-have-receive_buf.patch tty-n_hdlc-fix-__might_sleep-warning.patch cifs-fix-possible-hang-during-async-mtu-reads-and-writes.patch +input-xpad-add-support-for-steelseries-stratus-duo.patch