From 16394e998cbb050730536bdf7e89f5a70efbd974 Mon Sep 17 00:00:00 2001

From: Johan Hovold <johan@kernel.org>

Date: Mon, 25 Oct 2021 13:16:34 +0100

Subject: [PATCH] media: mceusb: fix control-message timeouts

Git-commit: 16394e998cbb050730536bdf7e89f5a70efbd974

Patch-mainline: v5.17-rc1

References: git-fixes

USB control-message timeouts are specified in milliseconds and should

specifically not vary with CONFIG_HZ.

Fixes: 66e89522aff7 ("V4L/DVB: IR: add mceusb IR receiver driver")

Cc: stable@vger.kernel.org      # 2.6.36

Signed-off-by: Johan Hovold <johan@kernel.org>

Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>

Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

Acked-by: Takashi Iwai <tiwai@suse.de>

---

 drivers/media/rc/mceusb.c | 8 ++++----

 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/media/rc/mceusb.c b/drivers/media/rc/mceusb.c

index d09bee82c04c..2dc810f5a73f 100644

--- a/drivers/media/rc/mceusb.c

+++ b/drivers/media/rc/mceusb.c

@@ -1430,7 +1430,7 @@ static void mceusb_gen1_init(struct mceusb_dev *ir)

 	 */

 	ret = usb_control_msg(ir->usbdev, usb_rcvctrlpipe(ir->usbdev, 0),

 			      USB_REQ_SET_ADDRESS, USB_TYPE_VENDOR, 0, 0,

-			      data, USB_CTRL_MSG_SZ, HZ * 3);

+			      data, USB_CTRL_MSG_SZ, 3000);

 	dev_dbg(dev, "set address - ret = %d", ret);

 	dev_dbg(dev, "set address - data[0] = %d, data[1] = %d",

 						data[0], data[1]);

@@ -1438,20 +1438,20 @@ static void mceusb_gen1_init(struct mceusb_dev *ir)

 	/* set feature: bit rate 38400 bps */

 	ret = usb_control_msg(ir->usbdev, usb_sndctrlpipe(ir->usbdev, 0),

 			      USB_REQ_SET_FEATURE, USB_TYPE_VENDOR,

-			      0xc04e, 0x0000, NULL, 0, HZ * 3);

+			      0xc04e, 0x0000, NULL, 0, 3000);

 	dev_dbg(dev, "set feature - ret = %d", ret);

 	/* bRequest 4: set char length to 8 bits */

 	ret = usb_control_msg(ir->usbdev, usb_sndctrlpipe(ir->usbdev, 0),

 			      4, USB_TYPE_VENDOR,

-			      0x0808, 0x0000, NULL, 0, HZ * 3);

+			      0x0808, 0x0000, NULL, 0, 3000);

 	dev_dbg(dev, "set char length - retB = %d", ret);

 	/* bRequest 2: set handshaking to use DTR/DSR */

 	ret = usb_control_msg(ir->usbdev, usb_sndctrlpipe(ir->usbdev, 0),

 			      2, USB_TYPE_VENDOR,

-			      0x0000, 0x0100, NULL, 0, HZ * 3);

+			      0x0000, 0x0100, NULL, 0, 3000);

 	dev_dbg(dev, "set handshake  - retC = %d", ret);

 	/* device resume */

-- 

2.31.1