aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZoltan Karcagi <zkr@freemail.hu>2009-05-06 16:30:21 +0200
committerJiri Kosina <jkosina@suse.cz>2009-05-11 17:09:17 +0200
commitf5208997087e6eb2096532b5a313eeb236535bdc (patch)
tree1cd808b76708dfbcbe187d7b73d5cd986afe717a
parentb4348f32dae3cb6eb4bc21c7ed8f76c0b11e9d6a (diff)
HID: fix dropped device-specific quirks
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>
-rw-r--r--drivers/hid/usbhid/hid-core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hid/usbhid/hid-core.c b/drivers/hid/usbhid/hid-core.c
index 900ce18dd54..ac8049b5f1e 100644
--- a/drivers/hid/usbhid/hid-core.c
+++ b/drivers/hid/usbhid/hid-core.c
@@ -898,7 +898,7 @@ static int usbhid_parse(struct hid_device *hid)
goto err;
}
- hid->quirks = quirks;
+ hid->quirks |= quirks;
return 0;
err: