diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-12 17:12:54 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-12 17:12:54 -0700 |
| commit | a4f1cb9f3c42e5d278b0678ed5225d9331a8dcff (patch) | |
| tree | 96f69bddb4952e64fffe02e677e9b41c1483d88f /drivers/hid/usbhid/hid-core.c | |
| parent | bd99f5e17b317a6d342ffaf500e2a9fd632d2a22 (diff) | |
| parent | b820aabf6cb987fd03d85b0b5f599685051e0426 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid10
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
HID: add NOGET quirk for devices from CH Products
HID: fix dropped device-specific quirks
Diffstat (limited to 'drivers/hid/usbhid/hid-core.c')
| -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 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: |