Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S966634AbbFJQHm (ORCPT ); Wed, 10 Jun 2015 12:07:42 -0400 Received: from ip4-83-240-67-251.cust.nbox.cz ([83.240.67.251]:36010 "EHLO ip4-83-240-18-248.cust.nbox.cz" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S933789AbbFJP1l (ORCPT ); Wed, 10 Jun 2015 11:27:41 -0400 From: Jiri Slaby To: stable@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Tommi Rantala , Dmitry Torokhov , Jiri Slaby Subject: [PATCH 3.12 017/111] Input: xpad - add Thrustmaster as Xbox 360 controller vendor Date: Wed, 10 Jun 2015 17:26:06 +0200 Message-Id: <5c2747507dcd611da078fdf66be467bdef3975a2.1433943052.git.jslaby@suse.cz> X-Mailer: git-send-email 2.4.2 In-Reply-To: <93091169a673f49c2574cddf1ef858cf0704f646.1433943052.git.jslaby@suse.cz> References: <93091169a673f49c2574cddf1ef858cf0704f646.1433943052.git.jslaby@suse.cz> In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1475 Lines: 38 From: Tommi Rantala 3.12-stable review patch. If anyone has any objections, please let me know. =============== commit 4dfb15cd5aaa6682e93854a74b394a1c95b82621 upstream. Add Thrustmaster as Xbox 360 controller vendor. This is required for example to make the GP XID (044f:b326) gamepad work. Signed-off-by: Tommi Rantala Signed-off-by: Dmitry Torokhov Signed-off-by: Jiri Slaby --- drivers/input/joystick/xpad.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c index 86a98b76e578..b0575bc518c1 100644 --- a/drivers/input/joystick/xpad.c +++ b/drivers/input/joystick/xpad.c @@ -294,6 +294,7 @@ static const signed short xpad_abs_triggers[] = { static struct usb_device_id xpad_table[] = { { USB_INTERFACE_INFO('X', 'B', 0) }, /* X-Box USB-IF not approved class */ + XPAD_XBOX360_VENDOR(0x044f), /* Thrustmaster X-Box 360 controllers */ XPAD_XBOX360_VENDOR(0x045e), /* Microsoft X-Box 360 controllers */ XPAD_XBOXONE_VENDOR(0x045e), /* Microsoft X-Box One controllers */ XPAD_XBOX360_VENDOR(0x046d), /* Logitech X-Box 360 style controllers */ -- 2.4.2 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/