| From f421400ac832a6093df574c45b24387e744e3692 Mon Sep 17 00:00:00 2001 |
| From: Enno Boland <gottox@voidlinux.eu> |
| Date: Tue, 19 Jun 2018 11:55:33 -0700 |
| Subject: Input: xpad - fix GPD Win 2 controller name |
| |
| [ Upstream commit dd6bee81c942c0ea01030da9356026afb88f9d18 ] |
| |
| This fixes using the controller with SDL2. |
| |
| SDL2 has a naive algorithm to apply the correct settings to a controller. |
| For X-Box compatible controllers it expects that the controller name |
| contains a variation of a 'XBOX'-string. |
| |
| This patch changes the identifier to contain "X-Box" as substring. Tested |
| with Steam and C-Dogs-SDL which both detect the controller properly after |
| adding this patch. |
| |
| Fixes: c1ba08390a8b ("Input: xpad - add GPD Win 2 Controller USB IDs") |
| Cc: stable@vger.kernel.org |
| Signed-off-by: Enno Boland <gottox@voidlinux.eu> |
| Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/input/joystick/xpad.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c |
| index 66cc37b41113..69b44aebaf01 100644 |
| --- a/drivers/input/joystick/xpad.c |
| +++ b/drivers/input/joystick/xpad.c |
| @@ -128,7 +128,7 @@ static const struct xpad_device { |
| u8 mapping; |
| u8 xtype; |
| } xpad_device[] = { |
| - { 0x0079, 0x18d4, "GPD Win 2 Controller", 0, XTYPE_XBOX360 }, |
| + { 0x0079, 0x18d4, "GPD Win 2 X-Box Controller", 0, XTYPE_XBOX360 }, |
| { 0x044f, 0x0f00, "Thrustmaster Wheel", 0, XTYPE_XBOX }, |
| { 0x044f, 0x0f03, "Thrustmaster Wheel", 0, XTYPE_XBOX }, |
| { 0x044f, 0x0f07, "Thrustmaster, Inc. Controller", 0, XTYPE_XBOX }, |
| -- |
| 2.17.1 |
| |
