summaryrefslogtreecommitdiffstats
path: root/drivers/hid/hid-core.c
diff options
context:
space:
mode:
authorBenjamin Tissoires <benjamin.tissoires@redhat.com>2018-03-20 12:04:51 +0100
committerJiri Kosina <jkosina@suse.cz>2018-03-23 15:46:09 +0100
commit2904e68ff2ceb6f18f2f130749e6862c90725ab6 (patch)
tree2e657d90087e176efb3657851cae88feda72a020 /drivers/hid/hid-core.c
parentadaabbf48fdf0ef31997e4054a88aaba16ad8b76 (diff)
downloadlinux-2904e68ff2ceb6f18f2f130749e6862c90725ab6.tar.gz
linux-2904e68ff2ceb6f18f2f130749e6862c90725ab6.tar.bz2
linux-2904e68ff2ceb6f18f2f130749e6862c90725ab6.zip
HID: core: reset the quirks before calling probe again
Given that now the quirk handling is done in hid-quirk.c, we can actually reset the quirks before calling .probe(), so that the drivers do not need to keep track of initial quirks. Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com> Acked-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
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 c2560aae5542..fdb8b6ed6d4c 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);