projects / thirdparty / kernel / stable-queue.git / blame
| Commit | Line | Data |
|---|---|---|
| 156d8e2c SL |
1 | From ab9ae39d9c6cd8213359fd2e223dba8dad8d8290 Mon Sep 17 00:00:00 2001 |
| 2 | From: Daniel Tobias <dan.g.tob@gmail.com> | |
| 3 | Date: Fri, 27 May 2016 16:25:10 -0700 | |
| 4 | Subject: Input: xpad - correctly sort vendor id's | |
| 5 | ||
| 6 | [ Upstream commit c02fc1d9e5d9f093296e43e13ec7f35f140784bd ] | |
| 7 | ||
| 8 | Signed-off-by: Daniel Tobias <dan.g.tob@gmail.com> | |
| 9 | Signed-off-by: Pavel Rojtberg <rojtberg@gmail.com> | |
| 10 | Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> | |
| 11 | Signed-off-by: Sasha Levin <sashal@kernel.org> | |
| 12 | --- | |
| 13 | drivers/input/joystick/xpad.c | 12 ++++++------ | |
| 14 | 1 file changed, 6 insertions(+), 6 deletions(-) | |
| 15 | ||
| 16 | diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c | |
| 17 | index b9f48d4e155a..8b7fc47f7ffb 100644 | |
| 18 | --- a/drivers/input/joystick/xpad.c | |
| 19 | +++ b/drivers/input/joystick/xpad.c | |
| 20 | @@ -321,19 +321,19 @@ static struct usb_device_id xpad_table[] = { | |
| 21 | XPAD_XBOXONE_VENDOR(0x0738), /* Mad Catz FightStick TE 2 */ | |
| 22 | XPAD_XBOX360_VENDOR(0x0e6f), /* 0x0e6f X-Box 360 controllers */ | |
| 23 | XPAD_XBOXONE_VENDOR(0x0e6f), /* 0x0e6f X-Box One controllers */ | |
| 24 | + XPAD_XBOX360_VENDOR(0x0f0d), /* Hori Controllers */ | |
| 25 | + XPAD_XBOXONE_VENDOR(0x0f0d), /* Hori Controllers */ | |
| 26 | XPAD_XBOX360_VENDOR(0x12ab), /* X-Box 360 dance pads */ | |
| 27 | XPAD_XBOX360_VENDOR(0x1430), /* RedOctane X-Box 360 controllers */ | |
| 28 | XPAD_XBOX360_VENDOR(0x146b), /* BigBen Interactive Controllers */ | |
| 29 | - XPAD_XBOX360_VENDOR(0x1bad), /* Harminix Rock Band Guitar and Drums */ | |
| 30 | - XPAD_XBOX360_VENDOR(0x0f0d), /* Hori Controllers */ | |
| 31 | - XPAD_XBOXONE_VENDOR(0x0f0d), /* Hori Controllers */ | |
| 32 | - XPAD_XBOX360_VENDOR(0x1689), /* Razer Onza */ | |
| 33 | - XPAD_XBOX360_VENDOR(0x24c6), /* PowerA Controllers */ | |
| 34 | - XPAD_XBOXONE_VENDOR(0x24c6), /* PowerA Controllers */ | |
| 35 | XPAD_XBOX360_VENDOR(0x1532), /* Razer Sabertooth */ | |
| 36 | XPAD_XBOXONE_VENDOR(0x1532), /* Razer Wildcat */ | |
| 37 | XPAD_XBOX360_VENDOR(0x15e4), /* Numark X-Box 360 controllers */ | |
| 38 | XPAD_XBOX360_VENDOR(0x162e), /* Joytech X-Box 360 controllers */ | |
| 39 | + XPAD_XBOX360_VENDOR(0x1689), /* Razer Onza */ | |
| 40 | + XPAD_XBOX360_VENDOR(0x1bad), /* Harminix Rock Band Guitar and Drums */ | |
| 41 | + XPAD_XBOX360_VENDOR(0x24c6), /* PowerA Controllers */ | |
| 42 | + XPAD_XBOXONE_VENDOR(0x24c6), /* PowerA Controllers */ | |
| 43 | { } | |
| 44 | }; | |
| 45 | ||
| 46 | -- | |
| 47 | 2.17.1 | |
| 48 |