From patchwork Sat May 22 20:00:28 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cory Maccarrone X-Patchwork-Id: 101673 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 o4MK0o3x019565 for ; Sat, 22 May 2010 20:00:50 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757270Ab0EVUAt (ORCPT ); Sat, 22 May 2010 16:00:49 -0400 Received: from mail-yw0-f180.google.com ([209.85.211.180]:64606 "EHLO mail-yw0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753153Ab0EVUAs (ORCPT ); Sat, 22 May 2010 16:00:48 -0400 Received: by ywh10 with SMTP id 10so1213397ywh.1 for ; Sat, 22 May 2010 13:00:48 -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; bh=+J1McIhy2s6dar63leplqUy+xq/dTQQF1LHJy4APZdg=; b=b7DpvtRWMevszACCYret3wfn53eQFiulE5dfZyVHgV7dBIVDPjum5Tmy8yU3rDkkQv EGIpf6o7bJoUZTbvIARTZTqdqxWvhsqqh3e2cMEJw5bSJaw5SM5T3XU8zFy0OLUnkh7C jhbenLuoJi5tdSkoP3nrH21Trm0PLmEE7dDFw= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=uC5+aML9VnS+EiWupkBjaMHGXuODt2c+QG/nQzqDY50xPq5OUwccf9cd5T4ePS20wo TTWgN/8FzY+izHjp8c1pJHRRHbbv2EBd3iNNt2J7/eEteIK1zXfMmpIdj8YE+iLZBVJx PMUnSY7RBqpa0QdsE1SToFxOkhmfS5fAsPCG0= Received: by 10.150.254.8 with SMTP id b8mr4452762ybi.381.1274558447958; Sat, 22 May 2010 13:00:47 -0700 (PDT) Received: from localhost (97-126-104-191.tukw.qwest.net [97.126.104.191]) by mx.google.com with ESMTPS id w3sm8040917ybi.21.2010.05.22.13.00.45 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sat, 22 May 2010 13:00:46 -0700 (PDT) From: Cory Maccarrone To: Dmitry Torokhov Cc: Andrew Morton , linux-input@vger.kernel.org, Cory Maccarrone Subject: [PATCH] [hid] Add the GYR4101US USB ID to hid-gyration Date: Sat, 22 May 2010 13:00:28 -0700 Message-Id: <1274558428-1799-1-git-send-email-darkstar6262@gmail.com> 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 (demeter.kernel.org [140.211.167.41]); Sat, 22 May 2010 20:00:50 +0000 (UTC) diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c index 368fbb0..6efc814 100644 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c @@ -1309,6 +1309,7 @@ static const struct hid_device_id hid_blacklist[] = { { HID_USB_DEVICE(USB_VENDOR_ID_GREENASIA, 0x0012) }, { HID_USB_DEVICE(USB_VENDOR_ID_GYRATION, USB_DEVICE_ID_GYRATION_REMOTE) }, { HID_USB_DEVICE(USB_VENDOR_ID_GYRATION, USB_DEVICE_ID_GYRATION_REMOTE_2) }, + { HID_USB_DEVICE(USB_VENDOR_ID_GYRATION, USB_DEVICE_ID_GYRATION_REMOTE_3) }, { HID_USB_DEVICE(USB_VENDOR_ID_KENSINGTON, USB_DEVICE_ID_KS_SLIMBLADE) }, { HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_ERGO_525V) }, { HID_USB_DEVICE(USB_VENDOR_ID_LABTEC, USB_DEVICE_ID_LABTEC_WIRELESS_KEYBOARD) }, diff --git a/drivers/hid/hid-gyration.c b/drivers/hid/hid-gyration.c index cab13e8..9de37d0 100644 --- a/drivers/hid/hid-gyration.c +++ b/drivers/hid/hid-gyration.c @@ -70,6 +70,7 @@ static int gyration_event(struct hid_device *hdev, struct hid_field *field, static const struct hid_device_id gyration_devices[] = { { HID_USB_DEVICE(USB_VENDOR_ID_GYRATION, USB_DEVICE_ID_GYRATION_REMOTE) }, { HID_USB_DEVICE(USB_VENDOR_ID_GYRATION, USB_DEVICE_ID_GYRATION_REMOTE_2) }, + { HID_USB_DEVICE(USB_VENDOR_ID_GYRATION, USB_DEVICE_ID_GYRATION_REMOTE_3) }, { } }; MODULE_DEVICE_TABLE(hid, gyration_devices); diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index 72c05f9..33ae92d 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h @@ -266,6 +266,7 @@ #define USB_VENDOR_ID_GYRATION 0x0c16 #define USB_DEVICE_ID_GYRATION_REMOTE 0x0002 #define USB_DEVICE_ID_GYRATION_REMOTE_2 0x0003 +#define USB_DEVICE_ID_GYRATION_REMOTE_3 0x0008 #define USB_VENDOR_ID_HAPP 0x078b #define USB_DEVICE_ID_UGCI_DRIVING 0x0010