diff options
| author | Johan Hovold <johan@kernel.org> | 2021-10-25 13:16:37 +0100 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab+huawei@kernel.org> | 2021-11-19 06:05:12 +0000 |
| commit | 10729be03327f53258cb196362015ad5c6eabe02 (patch) | |
| tree | a2f0fae8a8a40441b0459c352477d6d37ffa0e46 /drivers/media/usb | |
| parent | cd1798a387825cc4a51282f5a611ad05bb1ad75f (diff) | |
| download | linux-stable-10729be03327f53258cb196362015ad5c6eabe02.tar.gz linux-stable-10729be03327f53258cb196362015ad5c6eabe02.tar.bz2 linux-stable-10729be03327f53258cb196362015ad5c6eabe02.zip | |
media: cpia2: fix control-message timeouts
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>
Diffstat (limited to 'drivers/media/usb')
| -rw-r--r-- | drivers/media/usb/cpia2/cpia2_usb.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/usb/cpia2/cpia2_usb.c b/drivers/media/usb/cpia2/cpia2_usb.c index 76aac06f9fb8..cba03b286473 100644 --- 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_device *udev, 0, /* index */ buf, /* buffer */ size, - HZ); + 1000); kfree(buf); return ret; @@ -582,7 +582,7 @@ static int read_packet(struct usb_device *udev, 0, /* index */ buf, /* buffer */ size, - HZ); + 1000); if (ret >= 0) memcpy(registers, buf, size); |