From fb896b62af6f107545c0ade5d1eda8adfc93bd56 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Wed, 24 May 2017 18:06:02 +0100 Subject: [PATCH] Revert "hid: Reduce default mouse polling interval to 60Hz" This reverts commit b45c0448b60d691508251cdccf242ea43bbabb14. --- drivers/hid/usbhid/hid-core.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/drivers/hid/usbhid/hid-core.c b/drivers/hid/usbhid/hid-core.c index fb8777ab070b..7838343eb37c 100644 --- a/drivers/hid/usbhid/hid-core.c +++ b/drivers/hid/usbhid/hid-core.c @@ -49,7 +49,7 @@ * Module parameters. */ -static unsigned int hid_mousepoll_interval = ~0; +static unsigned int hid_mousepoll_interval; module_param_named(mousepoll, hid_mousepoll_interval, uint, 0644); MODULE_PARM_DESC(mousepoll, "Polling interval of mice"); @@ -1093,12 +1093,8 @@ static int usbhid_start(struct hid_device *hid) } /* Change the polling interval of mice. */ - if (hid->collection->usage == HID_GD_MOUSE) { - if (hid_mousepoll_interval == ~0 && interval < 16) - interval = 16; - else if (hid_mousepoll_interval != ~0 && hid_mousepoll_interval != 0) - interval = hid_mousepoll_interval; - } + if (hid->collection->usage == HID_GD_MOUSE && hid_mousepoll_interval > 0) + interval = hid_mousepoll_interval; ret = -ENOMEM; if (usb_endpoint_dir_in(endpoint)) { -- 2.30.2