diff options
| author | Zoltan Karcagi <zkr@freemail.hu> | 2009-05-06 16:30:21 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-06-15 09:40:14 -0700 |
| commit | 8905d71b7486fbe10423a08353bf484afdc09f9e (patch) | |
| tree | 2b9ad3a6d9b4efb7e5c2d5af65d349dfdc7e384a | |
| parent | 1e40bb56bb4d69f889377d39a9998285396043c9 (diff) | |
HID: fix dropped device-specific quirks
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>
| -rw-r--r-- | drivers/hid/usbhid/hid-core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hid/usbhid/hid-core.c b/drivers/hid/usbhid/hid-core.c index f0a0f72238ab..5e601316da61 100644 --- a/drivers/hid/usbhid/hid-core.c +++ b/drivers/hid/usbhid/hid-core.c @@ -765,7 +765,7 @@ static int usbhid_parse(struct hid_device *hid) goto err; } - hid->quirks = quirks; + hid->quirks |= quirks; return 0; err: |