From: Tommi Rantala Date: Thu, 16 Oct 2014 21:02:07 +0000 (-0700) Subject: Input: xpad - add Thrustmaster as Xbox 360 controller vendor X-Git-Tag: v3.12.44~95 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5c2747507dcd611da078fdf66be467bdef3975a2;p=thirdparty%2Fkernel%2Fstable.git Input: xpad - add Thrustmaster as Xbox 360 controller vendor commit 4dfb15cd5aaa6682e93854a74b394a1c95b82621 upstream. Add Thrustmaster as Xbox 360 controller vendor. This is required for example to make the GP XID (044f:b326) gamepad work. Signed-off-by: Tommi Rantala Signed-off-by: Dmitry Torokhov Signed-off-by: Jiri Slaby --- diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c index 86a98b76e5783..b0575bc518c1c 100644 --- a/drivers/input/joystick/xpad.c +++ b/drivers/input/joystick/xpad.c @@ -294,6 +294,7 @@ static const signed short xpad_abs_triggers[] = { static struct usb_device_id xpad_table[] = { { USB_INTERFACE_INFO('X', 'B', 0) }, /* X-Box USB-IF not approved class */ + XPAD_XBOX360_VENDOR(0x044f), /* Thrustmaster X-Box 360 controllers */ XPAD_XBOX360_VENDOR(0x045e), /* Microsoft X-Box 360 controllers */ XPAD_XBOXONE_VENDOR(0x045e), /* Microsoft X-Box One controllers */ XPAD_XBOX360_VENDOR(0x046d), /* Logitech X-Box 360 style controllers */