From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757444Ab1CRWa6 (ORCPT ); Fri, 18 Mar 2011 18:30:58 -0400 Received: from kroah.org ([198.145.64.141]:50613 "EHLO coco.kroah.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932616Ab1CRWax (ORCPT ); Fri, 18 Mar 2011 18:30:53 -0400 Date: Fri, 18 Mar 2011 15:02:05 -0700 From: Greg KH To: Keith Packard , Jiri Kosina Cc: stable@kernel.org, linux-kernel@vger.kernel.org, linux-input@vger.kernel.org Subject: Re: [stable] [PATCH] hid: Ortek W/L rdesc has incorrect Logical Maximum for keyboard (resend) Message-ID: <20110318220205.GB11644@kroah.com> References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Sun, Mar 13, 2011 at 11:56:16PM -0700, Keith Packard wrote: > > The Ortek WKB-2000 had the same rdesc bug -- the Logical Maximum value > was reported as '1' instead of the correct value (146), preventing > most of the keyboard keys from working. This patch simply shares > precisely the same quirk code for this other device. > > Signed-off-by: Keith Packard > --- > drivers/hid/hid-core.c | 1 + > drivers/hid/hid-ids.h | 1 + > drivers/hid/hid-ortek.c | 3 ++- > 3 files changed, 4 insertions(+), 1 deletions(-) Jiri, did this patch slip through the cracks? curious, greg k-h > > 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); > > -- > keith.packard@intel.com > _______________________________________________ > stable mailing list > stable@linux.kernel.org > http://linux.kernel.org/mailman/listinfo/stable