From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1761954AbZFIKaR (ORCPT ); Tue, 9 Jun 2009 06:30:17 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1760794AbZFIKUc (ORCPT ); Tue, 9 Jun 2009 06:20:32 -0400 Received: from kroah.org ([198.145.64.141]:55148 "EHLO coco.kroah.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760785AbZFIKUb (ORCPT ); Tue, 9 Jun 2009 06:20:31 -0400 X-Mailbox-Line: From greg@blue.kroah.org Tue Jun 9 02:41:04 2009 Message-Id: <20090609094104.729987455@blue.kroah.org> User-Agent: quilt/0.48-1 Date: Tue, 09 Jun 2009 02:39:42 -0700 From: Greg KH To: linux-kernel@vger.kernel.org, stable@kernel.org Cc: Justin Forbes , Zwane Mwaikambo , "Theodore Ts'o" , Randy Dunlap , Dave Jones , Chuck Wolber , Chris Wedgwood , Michael Krufky , Chuck Ebbert , Domenico Andreoli , Willy Tarreau , Rodrigo Rubira Branco , Jake Edge , Eugene Teo , torvalds@linux-foundation.org, akpm@linux-foundation.org, alan@lxorguk.ukuu.org.uk, Zoltan Karcagi , Jiri Kosina , Greg Kroah-Hartman Subject: [patch 54/87] HID: fix dropped device-specific quirks References: <20090609093848.204935043@blue.kroah.org> Content-Disposition: inline; filename=hid-fix-dropped-device-specific-quirks.patch In-Reply-To: <20090609094451.GA26439@kroah.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 2.6.29-stable review patch. If anyone has any objections, please let us know. ------------------ From: Zoltan Karcagi commit f5208997087e6eb2096532b5a313eeb236535bdc upstream. Device-specific quirks are set up correctly in their respective vendor-specific driver, then get overwritten in usbhid_parse(). This is only issue for device-specific NOGET quirks being set by driver for a few devices out there. Signed-off-by: Zoltan Karcagi Signed-off-by: Jiri Kosina Signed-off-by: Greg Kroah-Hartman --- drivers/hid/usbhid/hid-core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/hid/usbhid/hid-core.c +++ b/drivers/hid/usbhid/hid-core.c @@ -765,7 +765,7 @@ static int usbhid_parse(struct hid_devic goto err; } - hid->quirks = quirks; + hid->quirks |= quirks; return 0; err: