diff options
| author | Zoltan Karcagi <zkr@freemail.hu> | 2009-05-06 10:30:21 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2009-05-11 11:09:17 -0400 |
| commit | f5208997087e6eb2096532b5a313eeb236535bdc (patch) | |
| tree | 1cd808b76708dfbcbe187d7b73d5cd986afe717a | |
| parent | b4348f32dae3cb6eb4bc21c7ed8f76c0b11e9d6a (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.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 900ce18dd549..ac8049b5f1e9 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) | |||
| 898 | goto err; | 898 | goto err; |
| 899 | } | 899 | } |
| 900 | 900 | ||
| 901 | hid->quirks = quirks; | 901 | hid->quirks |= quirks; |
| 902 | 902 | ||
| 903 | return 0; | 903 | return 0; |
| 904 | err: | 904 | err: |