[patch 54/87] HID: fix dropped device-specific quirks

Greg KH
2009-06-09T10:30:17Z

[-- Attachment #1: hid-fix-dropped-device-specific-quirks.patch --]
[-- Type: text/plain, Size: 891 bytes --]

2.6.29-stable review patch. If anyone has any objections, please let us know.

------------------

From: Zoltan Karcagi <zkr@freemail.hu>

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 <zkr@freemail.hu>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---
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;