Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8fa05285 authored by Enno Boland's avatar Enno Boland Committed by Greg Kroah-Hartman
Browse files

Input: xpad - fix GPD Win 2 controller name 



commit dd6bee81c942c0ea01030da9356026afb88f9d18 upstream.

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: default avatarEnno Boland <gottox@voidlinux.eu>
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1b241aa8

drivers/input/joystick/xpad.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -126,7 +126,7 @@ static const struct xpad_device { 
	u8 mapping;

	u8 mapping;

	u8 xtype;

	u8 xtype;

} xpad_device[] = {

} 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, 0x0f00, "Thrustmaster Wheel", 0, XTYPE_XBOX },

	{ 0x044f, 0x0f03, "Thrustmaster Wheel", 0, XTYPE_XBOX },

	{ 0x044f, 0x0f03, "Thrustmaster Wheel", 0, XTYPE_XBOX },

	{ 0x044f, 0x0f07, "Thrustmaster, Inc. Controller", 0, XTYPE_XBOX },

	{ 0x044f, 0x0f07, "Thrustmaster, Inc. Controller", 0, XTYPE_XBOX },