| From ae39bd45d6085f603f9e27a073e04a3b8fb366d2 Mon Sep 17 00:00:00 2001 |
| From: Pavel Rojtberg <rojtberg@gmail.com> |
| Date: Tue, 12 Jan 2016 14:35:51 -0800 |
| Subject: Input: xpad - correct xbox one pad device name |
| |
| [ Upstream commit 95162dc8493ed92e5f7dcc8874e58c2ba3836b43 ] |
| |
| Apparently the Covert Forces ID is not Covert Forces pad exclusive, but |
| rather denotes a new firmware version that can be found on all new |
| controllers and can be also updated on old hardware using Windows 10. |
| |
| see: https://github.com/paroj/xpad/issues/19 |
| |
| Signed-off-by: Pavel Rojtberg <rojtberg@gmail.com> |
| 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 c3a38804cdc0..2f481ce2c8b0 100644 |
| --- a/drivers/input/joystick/xpad.c |
| +++ b/drivers/input/joystick/xpad.c |
| @@ -128,7 +128,7 @@ static const struct xpad_device { |
| { 0x045e, 0x0289, "Microsoft X-Box pad v2 (US)", 0, XTYPE_XBOX }, |
| { 0x045e, 0x028e, "Microsoft X-Box 360 pad", 0, XTYPE_XBOX360 }, |
| { 0x045e, 0x02d1, "Microsoft X-Box One pad", 0, XTYPE_XBOXONE }, |
| - { 0x045e, 0x02dd, "Microsoft X-Box One pad (Covert Forces)", 0, XTYPE_XBOXONE }, |
| + { 0x045e, 0x02dd, "Microsoft X-Box One pad (Firmware 2015)", 0, XTYPE_XBOXONE }, |
| { 0x045e, 0x0291, "Xbox 360 Wireless Receiver (XBOX)", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX360W }, |
| { 0x045e, 0x0719, "Xbox 360 Wireless Receiver", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX360W }, |
| { 0x044f, 0x0f07, "Thrustmaster, Inc. Controller", 0, XTYPE_XBOX }, |
| -- |
| 2.17.1 |
| |
