From patchwork Mon Feb 7 01:44:23 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Keith Packard X-Patchwork-Id: 537041 X-Patchwork-Delegate: jikos@jikos.cz 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 p171qSxL026049 for ; Mon, 7 Feb 2011 01:52:31 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754483Ab1BGBu4 (ORCPT ); Sun, 6 Feb 2011 20:50:56 -0500 Received: from home.keithp.com ([63.227.221.253]:54223 "EHLO keithp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754455Ab1BGBut (ORCPT ); Sun, 6 Feb 2011 20:50:49 -0500 X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Mon, 07 Feb 2011 01:52:35 +0000 (UTC) X-Greylist: delayed 355 seconds by postgrey-1.27 at vger.kernel.org; Sun, 06 Feb 2011 20:50:49 EST Received: from localhost (localhost [127.0.0.1]) by keithp.com (Postfix) with ESMTP id E3962760207; Sun, 6 Feb 2011 17:44:52 -0800 (PST) X-Virus-Scanned: Debian amavisd-new at keithp.com Received: from keithp.com ([127.0.0.1]) by localhost (keithp.com [127.0.0.1]) (amavisd-new, port 10024) with LMTP id qAhYzGmfNs70; Sun, 6 Feb 2011 17:44:50 -0800 (PST) Received: by keithp.com (Postfix, from userid 1033) id 1258D760206; Sun, 6 Feb 2011 17:44:50 -0800 (PST) Received: from koto.keithp.com (localhost [127.0.0.1]) by keithp.com (Postfix) with ESMTP id 08B507601AB; Sun, 6 Feb 2011 17:44:50 -0800 (PST) Received: by koto.keithp.com (Postfix, from userid 1488) id 5A62411C0D6; Sun, 6 Feb 2011 17:44:49 -0800 (PST) From: Keith Packard To: Jiri Kosina Cc: linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, stable@kernel.org, Keith Packard Subject: [PATCH] hid: Ortek W/L rdesc has incorrect Logical Maximum for keyboard Date: Sun, 6 Feb 2011 17:44:23 -0800 Message-Id: <1297043063-22539-1-git-send-email-keithp@keithp.com> X-Mailer: git-send-email 1.7.2.3 Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c index d678cf3..233bbf2 100644 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c @@ -1401,6 +1401,7 @@ static const struct hid_device_id hid_have_special_driver[] = { { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_17) }, { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_18) }, { HID_USB_DEVICE(USB_VENDOR_ID_ORTEK, USB_DEVICE_ID_ORTEK_WKB2000) }, + { HID_USB_DEVICE(USB_VENDOR_ID_ORTEK, USB_DEVICE_ID_ORTEK_WL) }, { HID_USB_DEVICE(USB_VENDOR_ID_PETALYNX, USB_DEVICE_ID_PETALYNX_MAXTER_REMOTE) }, { HID_USB_DEVICE(USB_VENDOR_ID_QUANTA, USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH) }, { HID_USB_DEVICE(USB_VENDOR_ID_QUANTA, USB_DEVICE_ID_PIXART_IMAGING_INC_OPTICAL_TOUCH_SCREEN) }, diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index 92a0d61..b478b25 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h @@ -467,6 +467,7 @@ #define USB_VENDOR_ID_ORTEK 0x05a4 #define USB_DEVICE_ID_ORTEK_WKB2000 0x2000 +#define USB_DEVICE_ID_ORTEK_WL 0x1700 #define USB_VENDOR_ID_PANJIT 0x134c diff --git a/drivers/hid/hid-ortek.c b/drivers/hid/hid-ortek.c index e90edfc..74011af 100644 --- a/drivers/hid/hid-ortek.c +++ b/drivers/hid/hid-ortek.c @@ -23,7 +23,7 @@ static __u8 *ortek_report_fixup(struct hid_device *hdev, __u8 *rdesc, unsigned int *rsize) { if (*rsize >= 56 && rdesc[54] == 0x25 && rdesc[55] == 0x01) { - hid_info(hdev, "Fixing up Ortek WKB-2000 report descriptor\n"); + hid_info(hdev, "Fixing up Ortek WKB-2000 or W/L report descriptor\n"); rdesc[55] = 0x92; } return rdesc; @@ -31,6 +31,7 @@ static __u8 *ortek_report_fixup(struct hid_device *hdev, __u8 *rdesc, static const struct hid_device_id ortek_devices[] = { { HID_USB_DEVICE(USB_VENDOR_ID_ORTEK, USB_DEVICE_ID_ORTEK_WKB2000) }, + { HID_USB_DEVICE(USB_VENDOR_ID_ORTEK, USB_DEVICE_ID_ORTEK_WL) }, { } }; MODULE_DEVICE_TABLE(hid, ortek_devices);