diff mbox series

Input: iforce - fix control-message timeout

Message ID 20211025115501.5190-1-johan@kernel.org (mailing list archive)
State Accepted
Commit 744d0090a5f6dfa4c81b53402ccdf08313100429
Headers show
Series Input: iforce - fix control-message timeout | expand

Commit Message

Johan Hovold Oct. 25, 2021, 11:55 a.m. UTC
USB control-message timeouts are specified in milliseconds and should
specifically not vary with CONFIG_HZ.

Fixes: 487358627825 ("Input: iforce - use DMA-safe buffer when getting IDs from USB")
Cc: stable@vger.kernel.org      # 5.3
Signed-off-by: Johan Hovold <johan@kernel.org>
---
 drivers/input/joystick/iforce/iforce-usb.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Dmitry Torokhov Nov. 10, 2021, 6:58 a.m. UTC | #1
On Mon, Oct 25, 2021 at 01:55:01PM +0200, Johan Hovold wrote:
> USB control-message timeouts are specified in milliseconds and should
> specifically not vary with CONFIG_HZ.
> 
> Fixes: 487358627825 ("Input: iforce - use DMA-safe buffer when getting IDs from USB")
> Cc: stable@vger.kernel.org      # 5.3
> Signed-off-by: Johan Hovold <johan@kernel.org>

Applied, thank you.
diff mbox series

Patch

diff --git a/drivers/input/joystick/iforce/iforce-usb.c b/drivers/input/joystick/iforce/iforce-usb.c
index 6c554c11a7ac..ea58805c480f 100644
--- a/drivers/input/joystick/iforce/iforce-usb.c
+++ b/drivers/input/joystick/iforce/iforce-usb.c
@@ -92,7 +92,7 @@  static int iforce_usb_get_id(struct iforce *iforce, u8 id,
 				 id,
 				 USB_TYPE_VENDOR | USB_DIR_IN |
 					USB_RECIP_INTERFACE,
-				 0, 0, buf, IFORCE_MAX_LENGTH, HZ);
+				 0, 0, buf, IFORCE_MAX_LENGTH, 1000);
 	if (status < 0) {
 		dev_err(&iforce_usb->intf->dev,
 			"usb_submit_urb failed: %d\n", status);