From: Zoltan Karcagi <zkr@freemail.hu>
Date: Wed, 6 May 2009 14:30:21 +0000 (+0200)
Subject: HID: fix dropped device-specific quirks
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=f5208997087e6eb2096532b5a313eeb236535bdc;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

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>
---

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)
 		goto err;
 	}
 
-	hid->quirks = quirks;
+	hid->quirks |= quirks;
 
 	return 0;
 err: