|
Oliver Neukum |
a04e6e |
From d9b7e8df3aa9b8c10708aab60e72e79ac08237e4 Mon Sep 17 00:00:00 2001
|
|
Oliver Neukum |
a04e6e |
From: Johan Hovold <johan@kernel.org>
|
|
Oliver Neukum |
a04e6e |
Date: Mon, 25 Oct 2021 13:16:38 +0100
|
|
Oliver Neukum |
a04e6e |
Subject: [PATCH] media: em28xx: fix control-message timeouts
|
|
Oliver Neukum |
a04e6e |
Git-commit: d9b7e8df3aa9b8c10708aab60e72e79ac08237e4
|
|
Oliver Neukum |
a04e6e |
REferences: git-fixes
|
|
Oliver Neukum |
a04e6e |
Patch-mainline: v5.17-rc1
|
|
Oliver Neukum |
a04e6e |
|
|
Oliver Neukum |
a04e6e |
USB control-message timeouts are specified in milliseconds and should
|
|
Oliver Neukum |
a04e6e |
specifically not vary with CONFIG_HZ.
|
|
Oliver Neukum |
a04e6e |
|
|
Oliver Neukum |
a04e6e |
Fixes: a6c2ba283565 ("[PATCH] v4l: 716: support for em28xx board family")
|
|
Oliver Neukum |
a04e6e |
Cc: stable@vger.kernel.org # 2.6.16
|
|
Oliver Neukum |
a04e6e |
Signed-off-by: Johan Hovold <johan@kernel.org>
|
|
Oliver Neukum |
a04e6e |
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
|
|
Oliver Neukum |
a04e6e |
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
|
|
Oliver Neukum |
a04e6e |
Signed-off-by: Oliver Neukum <oneukum@suse.com>
|
|
Oliver Neukum |
a04e6e |
---
|
|
Oliver Neukum |
a04e6e |
drivers/media/usb/em28xx/em28xx-core.c | 4 ++--
|
|
Oliver Neukum |
a04e6e |
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
Oliver Neukum |
a04e6e |
|
|
Oliver Neukum |
a04e6e |
--- a/drivers/media/usb/em28xx/em28xx-core.c
|
|
Oliver Neukum |
a04e6e |
+++ b/drivers/media/usb/em28xx/em28xx-core.c
|
|
Oliver Neukum |
a04e6e |
@@ -100,7 +100,7 @@ int em28xx_read_reg_req_len(struct em28x
|
|
Oliver Neukum |
a04e6e |
mutex_lock(&dev->ctrl_urb_lock);
|
|
Oliver Neukum |
a04e6e |
ret = usb_control_msg(udev, pipe, req,
|
|
Oliver Neukum |
a04e6e |
USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
|
|
Oliver Neukum |
a04e6e |
- 0x0000, reg, dev->urb_buf, len, HZ);
|
|
Oliver Neukum |
a04e6e |
+ 0x0000, reg, dev->urb_buf, len, 1000);
|
|
Oliver Neukum |
a04e6e |
if (ret < 0) {
|
|
Oliver Neukum |
a04e6e |
em28xx_regdbg("(pipe 0x%08x): IN: %02x %02x %02x %02x %02x %02x %02x %02x failed\n",
|
|
Oliver Neukum |
a04e6e |
pipe, USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
|
|
Oliver Neukum |
a04e6e |
@@ -175,7 +175,7 @@ int em28xx_write_regs_req(struct em28xx
|
|
Oliver Neukum |
a04e6e |
memcpy(dev->urb_buf, buf, len);
|
|
Oliver Neukum |
a04e6e |
ret = usb_control_msg(udev, pipe, req,
|
|
Oliver Neukum |
a04e6e |
USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
|
|
Oliver Neukum |
a04e6e |
- 0x0000, reg, dev->urb_buf, len, HZ);
|
|
Oliver Neukum |
a04e6e |
+ 0x0000, reg, dev->urb_buf, len, 1000);
|
|
Oliver Neukum |
a04e6e |
mutex_unlock(&dev->ctrl_urb_lock);
|
|
Oliver Neukum |
a04e6e |
|
|
Oliver Neukum |
a04e6e |
if (ret < 0)
|