From patchwork Thu May 6 21:34:01 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Vasut X-Patchwork-Id: 97449 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o46LZPEZ016761 for ; Thu, 6 May 2010 21:35:29 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752915Ab0EFVfZ (ORCPT ); Thu, 6 May 2010 17:35:25 -0400 Received: from fg-out-1718.google.com ([72.14.220.156]:38039 "EHLO fg-out-1718.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752381Ab0EFVfY (ORCPT ); Thu, 6 May 2010 17:35:24 -0400 Received: by fg-out-1718.google.com with SMTP id d23so534891fga.1 for ; Thu, 06 May 2010 14:35:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer:in-reply-to:references; bh=tB+9FuTvK/oEyGzFRahgvFnGJRxKUK6WLdDXWFWJlV8=; b=jAz5yECmWeyxhgH5u8QKn3jR2I3LzSj3WSNykxl8HdsWAmiP/tw6+uazV7fDo9uGpz 8oDCQM9wJcBSfxYLVg8fkzvOmPL3V1qHcpAPt8r/9TxqgcPcIwqzaLWZXLepzFULu64H 3bGmQEmekPWK43GB3qciO9RN16HuMpWwRr8CI= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=mxzhQx9xfq42FGchvRKmZ9pSxVHoabLblm3itlGPGcgR8icxj4V4r7h0iQ7GktB2r5 EUNcRt7SYJ3ijiWzFY3VO/ATb1LqtDEWAM8V3jT8aPBCdNlOE769DauRdD9d1d0sksNe 9UUcXPjBEA3MbIkG/uJz1jwBiyRIVSnI7vFIA= Received: by 10.103.3.7 with SMTP id f7mr12591610mui.62.1273181722913; Thu, 06 May 2010 14:35:22 -0700 (PDT) Received: from localhost.localdomain (vasut.kolej.mff.cuni.cz [78.128.198.52]) by mx.google.com with ESMTPS id u26sm5799502mug.25.2010.05.06.14.35.22 (version=SSLv3 cipher=RC4-MD5); Thu, 06 May 2010 14:35:22 -0700 (PDT) From: Marek Vasut To: linux-input@vger.kernel.org Cc: dmitry.torokhov@gmail.com, dtor@mail.ru, Marek Vasut Subject: [PATCH 2/2] iforce: Fix Gullemot Jet Leader 3D entry Date: Thu, 6 May 2010 23:34:01 +0200 Message-Id: <1273181641-24546-2-git-send-email-marek.vasut@gmail.com> X-Mailer: git-send-email 1.7.0 In-Reply-To: <1273181641-24546-1-git-send-email-marek.vasut@gmail.com> References: <1273181641-24546-1-git-send-email-marek.vasut@gmail.com> 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 (demeter.kernel.org [140.211.167.41]); Thu, 06 May 2010 21:35:29 +0000 (UTC) diff --git a/drivers/input/joystick/iforce/iforce-main.c b/drivers/input/joystick/iforce/iforce-main.c index 987faea..fc88fb7 100644 --- a/drivers/input/joystick/iforce/iforce-main.c +++ b/drivers/input/joystick/iforce/iforce-main.c @@ -81,7 +81,7 @@ static struct iforce_device iforce_device[] = { { 0x06f8, 0x0001, "Guillemot Race Leader Force Feedback", btn_wheel, abs_wheel, ff_iforce }, //? { 0x06f8, 0x0003, "Gullemot Jet Leader Force Feedback", btn_joystick, abs_joystick_rudder, ff_iforce }, { 0x06f8, 0x0004, "Guillemot Force Feedback Racing Wheel", btn_wheel, abs_wheel, ff_iforce }, //? - { 0x06f8, 0x0004, "Gullemot Jet Leader 3D", btn_joystick, abs_joystick, ff_iforce }, //? + { 0x06f8, 0xa302, "Gullemot Jet Leader 3D", btn_joystick, abs_joystick, ff_iforce }, //? { 0x06d6, 0x29bc, "Trust Force Feedback Race Master", btn_wheel, abs_wheel, ff_iforce }, { 0x0000, 0x0000, "Unknown I-Force Device [%04x:%04x]", btn_joystick, abs_joystick, ff_iforce } };