From: Frank Razenberg Date: Mon, 8 Sep 2014 18:32:20 +0000 (-0700) Subject: Input: xpad - add VID/PID for Razer Sabertooth X-Git-Tag: v3.16.35~3470 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d73acdbb12e475b3bb137bb32a300424f0b6092d;p=thirdparty%2Fkernel%2Fstable.git 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 Signed-off-by: Dmitry Torokhov Signed-off-by: Luis Henriques --- diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c index 603fe0dd3682f..a5a1b6f5796bd 100644 --- a/drivers/input/joystick/xpad.c +++ b/drivers/input/joystick/xpad.c @@ -169,6 +169,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 },