From patchwork Wed Jul 11 07:02:19 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yuri Khan X-Patchwork-Id: 1180681 Return-Path: X-Original-To: patchwork-linux-input@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 6DECEDF25A for ; Wed, 11 Jul 2012 07:04:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754692Ab2GKHDG (ORCPT ); Wed, 11 Jul 2012 03:03:06 -0400 Received: from mail-lb0-f174.google.com ([209.85.217.174]:45463 "EHLO mail-lb0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754057Ab2GKHCm (ORCPT ); Wed, 11 Jul 2012 03:02:42 -0400 Received: by lbbgm6 with SMTP id gm6so1859627lbb.19 for ; Wed, 11 Jul 2012 00:02:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=9UQMt6sN+yWdX+Rg86JMeYjJ/s8kCTHG1RAg4qO7Eow=; b=CubomIZbTKpn8FRSDTrR9LyB06ywllVBO2drP22Kq2lg+eKt7W5CTQ0t8ZkFiDJGqH 5gSlmzfvuiuBg0nTiBAL69a0k/4nP4OOAuWJ3WKbpC4C0fpmHrNeRWUdBDTHT4dYW+H4 SHLdDDGmrKtiAn3kwbWWutkhPuB2n/fpv6yqAdYdQYpXy1XLhBFHurL/5yJB39TWJxsE uxKfLKHPRa8XwvYTbptfRwSQ2RnW3jqTypSHwCdhbvKRMJu2UuQ5rHd3lFK7AGQWqscm +Tvc9/t/KMEM8//TJffua2jlaORb7IDQdr1hPdEW9MiWOjOxDokii/c/syBbBHy2YIDg bzag== Received: by 10.112.88.34 with SMTP id bd2mr20600274lbb.33.1341990159906; Wed, 11 Jul 2012 00:02:39 -0700 (PDT) Received: from centaur-pc.khan.local (l49-192-196.cn.ru. [178.49.192.196]) by mx.google.com with ESMTPS id pe8sm974865lab.17.2012.07.11.00.02.37 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 11 Jul 2012 00:02:38 -0700 (PDT) From: Yuri Khan To: Dmitry Torokhov Cc: Jiri Kosina , linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org, Yuri Khan Subject: [PATCH v4 1/1] Input: xpad - Handle all variations of Mad Catz Beat Pad Date: Wed, 11 Jul 2012 14:02:19 +0700 Message-Id: <1341990139-3864-1-git-send-email-yurivkhan@gmail.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1341592324-665-1-git-send-email-yurivkhan@gmail.com> References: <1341592324-665-1-git-send-email-yurivkhan@gmail.com> Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org * Add this device to usbhid ignore list Signed-off-by: Yuri Khan Acked-by: Jiri Kosina --- drivers/hid/hid-core.c | 1 + drivers/hid/hid-ids.h | 3 +++ drivers/input/joystick/xpad.c | 1 + 3 files changed, 5 insertions(+) diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c index 6ac0286..1540934 100644 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c @@ -1995,6 +1995,7 @@ static const struct hid_device_id hid_ignore_list[] = { { HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_MCT) }, { HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_HYBRID) }, { HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_HEATCONTROL) }, + { HID_USB_DEVICE(USB_VENDOR_ID_MADCATZ, USB_DEVICE_ID_MADCATZ_BEATPAD) }, { HID_USB_DEVICE(USB_VENDOR_ID_MCC, USB_DEVICE_ID_MCC_PMD1024LS) }, { HID_USB_DEVICE(USB_VENDOR_ID_MCC, USB_DEVICE_ID_MCC_PMD1208LS) }, { HID_USB_DEVICE(USB_VENDOR_ID_MICROCHIP, USB_DEVICE_ID_PICKIT1) }, diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index d1cdd2d..43c3d75 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h @@ -518,6 +518,9 @@ #define USB_DEVICE_ID_CRYSTALTOUCH 0x0006 #define USB_DEVICE_ID_CRYSTALTOUCH_DUAL 0x0007 +#define USB_VENDOR_ID_MADCATZ 0x0738 +#define USB_DEVICE_ID_MADCATZ_BEATPAD 0x4540 + #define USB_VENDOR_ID_MCC 0x09db #define USB_DEVICE_ID_MCC_PMD1024LS 0x0076 #define USB_DEVICE_ID_MCC_PMD1208LS 0x007a diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c index ee16fb6..16974ef 100644 --- a/drivers/input/joystick/xpad.c +++ b/drivers/input/joystick/xpad.c @@ -238,6 +238,7 @@ static struct usb_device_id xpad_table [] = { XPAD_XBOX360_VENDOR(0x045e), /* Microsoft X-Box 360 controllers */ XPAD_XBOX360_VENDOR(0x046d), /* Logitech X-Box 360 style controllers */ XPAD_XBOX360_VENDOR(0x0738), /* Mad Catz X-Box 360 controllers */ + { USB_DEVICE(0x0738, 0x4540) }, /* Mad Catz Beat Pad */ XPAD_XBOX360_VENDOR(0x0e6f), /* 0x0e6f X-Box 360 controllers */ XPAD_XBOX360_VENDOR(0x12ab), /* X-Box 360 dance pads */ XPAD_XBOX360_VENDOR(0x1430), /* RedOctane X-Box 360 controllers */