summaryrefslogtreecommitdiff
path: root/drivers/input
diff options
context:
space:
mode:
authorFrank Razenberg <frank@zzattack.org>2014-09-08 22:32:20 +0400
committerJiri Slaby <jslaby@suse.cz>2014-11-13 21:02:01 +0300
commitc4736877ce6ddfbefd32cac42da6524e9e0370cc (patch)
tree39aa66370e1e77abbcd77d76324299dfbd86cd87 /drivers/input
parent6ba3c3431eb82ecf8d8f2d3941fa8f65a6e32546 (diff)
downloadlinux-c4736877ce6ddfbefd32cac42da6524e9e0370cc.tar.xz
Input: xpad - add VID/PID for Razer Sabertooth
commit a7b447380c5c974c740437af82793e450f47304d upstream. The xpad driver recognizes Razer Sabertooth controllers as generic xbox controller, while it is really a 360 controller. This patch adds pid/vid mappings for the controller so that it is correctly recognized. Signed-off-by: Frank Razenberg <frank@zzattack.org> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Diffstat (limited to 'drivers/input')
-rw-r--r--drivers/input/joystick/xpad.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
index 995e79fa7dad..ac15b1395caf 100644
--- a/drivers/input/joystick/xpad.c
+++ b/drivers/input/joystick/xpad.c
@@ -170,6 +170,7 @@ static const struct xpad_device {
{ 0x146b, 0x0601, "BigBen Interactive XBOX 360 Controller", 0, XTYPE_XBOX360 },
{ 0x1689, 0xfd00, "Razer Onza Tournament Edition", 0, XTYPE_XBOX360 },
{ 0x1689, 0xfd01, "Razer Onza Classic Edition", 0, XTYPE_XBOX360 },
+ { 0x24c6, 0x5d04, "Razer Sabertooth", 0, XTYPE_XBOX360 },
{ 0x1bad, 0x0002, "Harmonix Rock Band Guitar", 0, XTYPE_XBOX360 },
{ 0x1bad, 0x0003, "Harmonix Rock Band Drumkit", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX360 },
{ 0x1bad, 0xf016, "Mad Catz Xbox 360 Controller", 0, XTYPE_XBOX360 },