From patchwork Wed Nov 24 05:49:43 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: simon@mungewell.org X-Patchwork-Id: 351721 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oAO5oKp2021792 for ; Wed, 24 Nov 2010 05:50:21 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751433Ab0KXFuT (ORCPT ); Wed, 24 Nov 2010 00:50:19 -0500 Received: from idcmail-mo2no.shaw.ca ([64.59.134.9]:33655 "EHLO idcmail-mo2no.shaw.ca" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751121Ab0KXFuT (ORCPT ); Wed, 24 Nov 2010 00:50:19 -0500 Received: from pd7ml3no-ssvc.prod.shaw.ca ([10.0.153.150]) by pd5mo1no-svcs.prod.shaw.ca with ESMTP; 23 Nov 2010 22:50:17 -0700 X-Cloudmark-SP-Filtered: true X-Cloudmark-SP-Result: v=1.1 cv=H95gfW32JB/XYJSBuOTvJ8IIviFcsPdfxXHbM7LS6jM= c=1 sm=1 a=qMa_7ido1v0A:10 a=BLceEmwcHowA:10 a=oaxjXb+On79cRBAvziGSJw==:17 a=pGLkceISAAAA:8 a=47LbCVvxAAAA:8 a=04kkzpr1NNfxbjoLnVoA:9 a=-Otjmt2ue4RQOL7OoeynFeXGNJ0A:4 a=MSl-tDqOz04A:10 a=QhNQsjeWOoAA:10 a=HpAAvcLHHh0Zw7uRqdWCyQ==:117 Received: from unknown (HELO localhost.localdomain) ([70.72.59.135]) by pd7ml3no-dmz.prod.shaw.ca with ESMTP; 23 Nov 2010 22:50:17 -0700 From: Simon Wood To: linux-input@vger.kernel.org Cc: aorefice77@gmail.com, ospite@studenti.unina.it, Simon Wood Subject: [PATCH] USB HID Add support for F430 Force Feedback Wheel Date: Tue, 23 Nov 2010 22:49:43 -0700 Message-Id: <1290577783-5756-1-git-send-email-simon@mungewell.org> X-Mailer: git-send-email 1.7.0.4 Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Wed, 24 Nov 2010 05:50:21 +0000 (UTC) diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c index 515345b..88cb04e 100644 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c @@ -1386,6 +1386,7 @@ static const struct hid_device_id hid_blacklist[] = { { HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb651) }, { HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb653) }, { HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb654) }, + { HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb65a) }, { HID_USB_DEVICE(USB_VENDOR_ID_TOPSEED, USB_DEVICE_ID_TOPSEED_CYBERLINK) }, { HID_USB_DEVICE(USB_VENDOR_ID_TOPSEED2, USB_DEVICE_ID_TOPSEED2_RF_COMBO) }, { HID_USB_DEVICE(USB_VENDOR_ID_TWINHAN, USB_DEVICE_ID_TWINHAN_IR_REMOTE) }, diff --git a/drivers/hid/hid-tmff.c b/drivers/hid/hid-tmff.c index 15434c8..25be4e1 100644 --- a/drivers/hid/hid-tmff.c +++ b/drivers/hid/hid-tmff.c @@ -256,6 +256,8 @@ static const struct hid_device_id tm_devices[] = { .driver_data = (unsigned long)ff_joystick }, { HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb654), /* FGT Force Feedback Wheel */ .driver_data = (unsigned long)ff_joystick }, + { HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb65a), /* F430 Force Feedback Wheel */ + .driver_data = (unsigned long)ff_joystick }, { } }; MODULE_DEVICE_TABLE(hid, tm_devices);