github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-07 05:55:44 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

media: cpia2: fix control-message timeouts

Browse Source 
commit 10729be033 upstream.

USB control-message timeouts are specified in milliseconds and should
specifically not vary with CONFIG_HZ.

Fixes: ab33d5071d ("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>
This commit is contained in:
Johan Hovold 2021-10-25 13:16:37 +01:00 committed by Greg Kroah-Hartman
parent d90833106c
commit 09b0b918a6
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/media/usb/cpia2/cpia2_usb.c
View File

@ -550,7 +550,7 @@ static int write_packet(struct usb_device *udev,
0, /* index */ 0, /* index */
buf, /* buffer */ buf, /* buffer */
size, size,
HZ); 1000);
kfree(buf); kfree(buf);
return ret; return ret;
@ -582,7 +582,7 @@ static int read_packet(struct usb_device *udev,
0, /* index */ 0, /* index */
buf, /* buffer */ buf, /* buffer */
size, size,
HZ); 1000);
if (ret >= 0) if (ret >= 0)
memcpy(registers, buf, size); memcpy(registers, buf, size);