| From d05a424bea9aa3435009d5c462055008cc1545d8 Mon Sep 17 00:00:00 2001 |
| From: Vicki Pfau <vi@endrift.com> |
| Date: Fri, 28 Mar 2025 16:43:36 -0700 |
| Subject: Input: xpad - fix two controller table values |
| |
| From: Vicki Pfau <vi@endrift.com> |
| |
| commit d05a424bea9aa3435009d5c462055008cc1545d8 upstream. |
| |
| Two controllers -- Mad Catz JOYTECH NEO SE Advanced and PDP Mirror's |
| Edge Official -- were missing the value of the mapping field, and thus |
| wouldn't detect properly. |
| |
| Signed-off-by: Vicki Pfau <vi@endrift.com> |
| Link: https://lore.kernel.org/r/20250328234345.989761-1-vi@endrift.com |
| Fixes: 540602a43ae5 ("Input: xpad - add a few new VID/PID combinations") |
| Fixes: 3492321e2e60 ("Input: xpad - add multiple supported devices") |
| Cc: stable@vger.kernel.org |
| Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/input/joystick/xpad.c | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| --- a/drivers/input/joystick/xpad.c |
| +++ b/drivers/input/joystick/xpad.c |
| @@ -206,7 +206,7 @@ static const struct xpad_device { |
| { 0x0738, 0x9871, "Mad Catz Portable Drum", 0, XTYPE_XBOX360 }, |
| { 0x0738, 0xb726, "Mad Catz Xbox controller - MW2", 0, XTYPE_XBOX360 }, |
| { 0x0738, 0xb738, "Mad Catz MVC2TE Stick 2", MAP_TRIGGERS_TO_BUTTONS, XTYPE_XBOX360 }, |
| - { 0x0738, 0xbeef, "Mad Catz JOYTECH NEO SE Advanced GamePad", XTYPE_XBOX360 }, |
| + { 0x0738, 0xbeef, "Mad Catz JOYTECH NEO SE Advanced GamePad", 0, XTYPE_XBOX360 }, |
| { 0x0738, 0xcb02, "Saitek Cyborg Rumble Pad - PC/Xbox 360", 0, XTYPE_XBOX360 }, |
| { 0x0738, 0xcb03, "Saitek P3200 Rumble Pad - PC/Xbox 360", 0, XTYPE_XBOX360 }, |
| { 0x0738, 0xcb29, "Saitek Aviator Stick AV8R02", 0, XTYPE_XBOX360 }, |
| @@ -241,7 +241,7 @@ static const struct xpad_device { |
| { 0x0e6f, 0x0146, "Rock Candy Wired Controller for Xbox One", 0, XTYPE_XBOXONE }, |
| { 0x0e6f, 0x0147, "PDP Marvel Xbox One Controller", 0, XTYPE_XBOXONE }, |
| { 0x0e6f, 0x015c, "PDP Xbox One Arcade Stick", MAP_TRIGGERS_TO_BUTTONS, XTYPE_XBOXONE }, |
| - { 0x0e6f, 0x015d, "PDP Mirror's Edge Official Wired Controller for Xbox One", XTYPE_XBOXONE }, |
| + { 0x0e6f, 0x015d, "PDP Mirror's Edge Official Wired Controller for Xbox One", 0, XTYPE_XBOXONE }, |
| { 0x0e6f, 0x0161, "PDP Xbox One Controller", 0, XTYPE_XBOXONE }, |
| { 0x0e6f, 0x0162, "PDP Xbox One Controller", 0, XTYPE_XBOXONE }, |
| { 0x0e6f, 0x0163, "PDP Xbox One Controller", 0, XTYPE_XBOXONE }, |
