This is a note to let you know that I've just added the patch titled
media: stk1160: fix control-message timeouts
to the 5.10-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
media-stk1160-fix-control-message-timeouts.patch
and it can be found in the queue-5.10 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 6aa6e70cdb5b863a57bad61310bf89b6617a5d2d Mon Sep 17 00:00:00 2001
From: Johan Hovold <johan@xxxxxxxxxx>
Date: Mon, 25 Oct 2021 13:16:41 +0100
Subject: media: stk1160: fix control-message timeouts
From: Johan Hovold <johan@xxxxxxxxxx>
commit 6aa6e70cdb5b863a57bad61310bf89b6617a5d2d upstream.
USB control-message timeouts are specified in milliseconds and should
specifically not vary with CONFIG_HZ.
Fixes: 9cb2173e6ea8 ("[media] media: Add stk1160 new driver (easycap replacement)")
Cc: stable@xxxxxxxxxxxxxxx # 3.7
Signed-off-by: Johan Hovold <johan@xxxxxxxxxx>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/media/usb/stk1160/stk1160-core.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- a/drivers/media/usb/stk1160/stk1160-core.c
+++ b/drivers/media/usb/stk1160/stk1160-core.c
@@ -65,7 +65,7 @@ int stk1160_read_reg(struct stk1160 *dev
return -ENOMEM;
ret = usb_control_msg(dev->udev, pipe, 0x00,
USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
- 0x00, reg, buf, sizeof(u8), HZ);
+ 0x00, reg, buf, sizeof(u8), 1000);
if (ret < 0) {
stk1160_err("read failed on reg 0x%x (%d)\n",
reg, ret);
@@ -85,7 +85,7 @@ int stk1160_write_reg(struct stk1160 *de
ret = usb_control_msg(dev->udev, pipe, 0x01,
USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
- value, reg, NULL, 0, HZ);
+ value, reg, NULL, 0, 1000);
if (ret < 0) {
stk1160_err("write failed on reg 0x%x (%d)\n",
reg, ret);
Patches currently in stable-queue which might be from johan@xxxxxxxxxx are
queue-5.10/media-mceusb-fix-control-message-timeouts.patch
queue-5.10/media-flexcop-usb-fix-control-message-timeouts.patch
queue-5.10/media-stk1160-fix-control-message-timeouts.patch
queue-5.10/media-pvrusb2-fix-control-message-timeouts.patch
queue-5.10/media-s2255-fix-control-message-timeouts.patch
queue-5.10/media-cpia2-fix-control-message-timeouts.patch
queue-5.10/media-redrat3-fix-control-message-timeouts.patch
queue-5.10/can-softing_cs-softingcs_probe-fix-memleak-on-registration-failure.patch
queue-5.10/media-em28xx-fix-control-message-timeouts.patch
