media: cpia2: fix control-message timeouts
commit 10729be03327f53258cb196362015ad5c6eabe02 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:
parent
3667e03685
commit
15757f1a72
@ -559,7 +559,7 @@ static int write_packet(struct usb_device *udev,
|
||||
0, /* index */
|
||||
buf, /* buffer */
|
||||
size,
|
||||
HZ);
|
||||
1000);
|
||||
|
||||
kfree(buf);
|
||||
return ret;
|
||||
@ -591,7 +591,7 @@ static int read_packet(struct usb_device *udev,
|
||||
0, /* index */
|
||||
buf, /* buffer */
|
||||
size,
|
||||
HZ);
|
||||
1000);
|
||||
|
||||
if (ret >= 0)
|
||||
memcpy(registers, buf, size);
|
||||
|
Loading…
Reference in New Issue
Block a user