| From 10729be03327f53258cb196362015ad5c6eabe02 Mon Sep 17 00:00:00 2001 |
| From: Johan Hovold <johan@kernel.org> |
| Date: Mon, 25 Oct 2021 13:16:37 +0100 |
| Subject: media: cpia2: fix control-message timeouts |
| |
| From: Johan Hovold <johan@kernel.org> |
| |
| commit 10729be03327f53258cb196362015ad5c6eabe02 upstream. |
| |
| USB control-message timeouts are specified in milliseconds and should |
| specifically not vary with CONFIG_HZ. |
| |
| Fixes: ab33d5071de7 ("V4L/DVB (3376): Add cpia2 camera support") |
| Cc: stable@vger.kernel.org # 2.6.17 |
| 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> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/media/usb/cpia2/cpia2_usb.c | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| --- a/drivers/media/usb/cpia2/cpia2_usb.c |
| +++ b/drivers/media/usb/cpia2/cpia2_usb.c |
| @@ -550,7 +550,7 @@ static int write_packet(struct usb_devic |
| 0, /* index */ |
| buf, /* buffer */ |
| size, |
| - HZ); |
| + 1000); |
| |
| kfree(buf); |
| return ret; |
| @@ -582,7 +582,7 @@ static int read_packet(struct usb_device |
| 0, /* index */ |
| buf, /* buffer */ |
| size, |
| - HZ); |
| + 1000); |
| |
| if (ret >= 0) |
| memcpy(registers, buf, size); |
