2 files changed, 18 insertions, 3 deletions

diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
index 635d11135090..14ffef04113c 100644
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -4085,6 +4085,9 @@
         usbhid.mousepoll=
                         [USBHID] The interval which mice are to be polled at.
 
+        usbhid.jspoll=
+                        [USBHID] The interval which joysticks are to be polled at.
+
         usb-storage.delay_use=
                         [UMS] The delay in seconds before a new device is
                         scanned for Logical Units (default 1).
diff --git a/drivers/hid/usbhid/hid-core.c b/drivers/hid/usbhid/hid-core.c
index 961bc6fdd2d9..b06fee1b8e47 100644
--- a/drivers/hid/usbhid/hid-core.c
+++ b/drivers/hid/usbhid/hid-core.c
@@ -52,6 +52,10 @@ static unsigned int hid_mousepoll_interval;
 module_param_named(mousepoll, hid_mousepoll_interval, uint, 0644);
 MODULE_PARM_DESC(mousepoll, "Polling interval of mice");
 
+static unsigned int hid_jspoll_interval;
+module_param_named(jspoll, hid_jspoll_interval, uint, 0644);
+MODULE_PARM_DESC(jspoll, "Polling interval of joysticks");
+
 static unsigned int ignoreled;
 module_param_named(ignoreled, ignoreled, uint, 0644);
 MODULE_PARM_DESC(ignoreled, "Autosuspend with active leds");
@@ -1081,9 +1085,17 @@ static int usbhid_start(struct hid_device *hid)
                                hid->name, endpoint->bInterval, interval);
                 }
 
-                /* Change the polling interval of mice. */
-                if (hid->collection->usage == HID_GD_MOUSE && hid_mousepoll_interval > 0)
-                        interval = hid_mousepoll_interval;
+                /* Change the polling interval of mice and joysticks. */
+                switch (hid->collection->usage) {
+                case HID_GD_MOUSE:
+                        if (hid_mousepoll_interval > 0)
+                                interval = hid_mousepoll_interval;
+                        break;
+                case HID_GD_JOYSTICK:
+                        if (hid_jspoll_interval > 0)
+                                interval = hid_jspoll_interval;
+                        break;
+                }
 
                 ret = -ENOMEM;
                 if (usb_endpoint_dir_in(endpoint)) {