summaryrefslogtreecommitdiffstats
path: root/drivers/hid/hid-core.c
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2018-04-05 13:19:57 +0200
committerJiri Kosina <jkosina@suse.cz>2018-04-05 13:27:22 +0200
commitaf73686e7bfe49fbbccc099995be8c78ce5bfe9a (patch)
treeb5dd616fc6894b433e06b1f16aec0b5443deee17 /drivers/hid/hid-core.c
parentf73fee743b5c44abc217f957a13fe0721c89450b (diff)
parent2904e68ff2ceb6f18f2f130749e6862c90725ab6 (diff)
downloadlinux-af73686e7bfe49fbbccc099995be8c78ce5bfe9a.tar.bz2
Merge branch 'for-4.17/multitouch' into for-linus
Pull Razer Blade Stealth support improvement and a few generic cleanups
Diffstat (limited to 'drivers/hid/hid-core.c')
-rw-r--r--drivers/hid/hid-core.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index 4fc08c38bc0e..a40681d5a2a3 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -1966,6 +1966,8 @@ static int hid_device_probe(struct device *dev)
}
}
+ /* reset the quirks that has been previously set */
+ hdev->quirks = hid_lookup_quirk(hdev);
hdev->driver = hdrv;
if (hdrv->probe) {
ret = hdrv->probe(hdev, id);