projects / GitHub / exynos8895 / android_kernel_samsung_universal8895.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: b4348f3)
HID: fix dropped device-specific quirks
authorZoltan Karcagi <zkr@freemail.hu>
Wed, 6 May 2009 14:30:21 +0000 (16:30 +0200)
committerJiri Kosina <jkosina@suse.cz>
Mon, 11 May 2009 15:09:17 +0000 (17:09 +0200)
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>
drivers/hid/usbhid/hid-core.c patch | blob | blame | history

diff --git a/drivers/hid/usbhid/hid-core.c b/drivers/hid/usbhid/hid-core.c
index 900ce18dd5490a4982e2f495693a9da8684e96e5..ac8049b5f1e934a658f3127457efc7626794c7e8 100644 (file)
--- 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: