| From ab9ae39d9c6cd8213359fd2e223dba8dad8d8290 Mon Sep 17 00:00:00 2001 |
| From: Daniel Tobias <dan.g.tob@gmail.com> |
| Date: Fri, 27 May 2016 16:25:10 -0700 |
| Subject: Input: xpad - correctly sort vendor id's |
| |
| [ Upstream commit c02fc1d9e5d9f093296e43e13ec7f35f140784bd ] |
| |
| Signed-off-by: Daniel Tobias <dan.g.tob@gmail.com> |
| 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 | 12 ++++++------ |
| 1 file changed, 6 insertions(+), 6 deletions(-) |
| |
| diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c |
| index b9f48d4e155a..8b7fc47f7ffb 100644 |
| --- a/drivers/input/joystick/xpad.c |
| +++ b/drivers/input/joystick/xpad.c |
| @@ -321,19 +321,19 @@ static struct usb_device_id xpad_table[] = { |
| XPAD_XBOXONE_VENDOR(0x0738), /* Mad Catz FightStick TE 2 */ |
| XPAD_XBOX360_VENDOR(0x0e6f), /* 0x0e6f X-Box 360 controllers */ |
| XPAD_XBOXONE_VENDOR(0x0e6f), /* 0x0e6f X-Box One controllers */ |
| + XPAD_XBOX360_VENDOR(0x0f0d), /* Hori Controllers */ |
| + XPAD_XBOXONE_VENDOR(0x0f0d), /* Hori Controllers */ |
| XPAD_XBOX360_VENDOR(0x12ab), /* X-Box 360 dance pads */ |
| XPAD_XBOX360_VENDOR(0x1430), /* RedOctane X-Box 360 controllers */ |
| XPAD_XBOX360_VENDOR(0x146b), /* BigBen Interactive Controllers */ |
| - XPAD_XBOX360_VENDOR(0x1bad), /* Harminix Rock Band Guitar and Drums */ |
| - XPAD_XBOX360_VENDOR(0x0f0d), /* Hori Controllers */ |
| - XPAD_XBOXONE_VENDOR(0x0f0d), /* Hori Controllers */ |
| - XPAD_XBOX360_VENDOR(0x1689), /* Razer Onza */ |
| - XPAD_XBOX360_VENDOR(0x24c6), /* PowerA Controllers */ |
| - XPAD_XBOXONE_VENDOR(0x24c6), /* PowerA Controllers */ |
| XPAD_XBOX360_VENDOR(0x1532), /* Razer Sabertooth */ |
| XPAD_XBOXONE_VENDOR(0x1532), /* Razer Wildcat */ |
| XPAD_XBOX360_VENDOR(0x15e4), /* Numark X-Box 360 controllers */ |
| XPAD_XBOX360_VENDOR(0x162e), /* Joytech X-Box 360 controllers */ |
| + XPAD_XBOX360_VENDOR(0x1689), /* Razer Onza */ |
| + XPAD_XBOX360_VENDOR(0x1bad), /* Harminix Rock Band Guitar and Drums */ |
| + XPAD_XBOX360_VENDOR(0x24c6), /* PowerA Controllers */ |
| + XPAD_XBOXONE_VENDOR(0x24c6), /* PowerA Controllers */ |
| { } |
| }; |
| |
| -- |
| 2.17.1 |
| |
