| From f5208997087e6eb2096532b5a313eeb236535bdc Mon Sep 17 00:00:00 2001 |
| From: Zoltan Karcagi <zkr@freemail.hu> |
| Date: Wed, 6 May 2009 16:30:21 +0200 |
| Subject: HID: fix dropped device-specific quirks |
| |
| 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; |
| err: |
