media: cpia2: fix control-message timeouts
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>
This commit is contained in:
parent
cd1798a387
commit
10729be033
|
@ -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);
|
||||||
|
|
Loading…
Reference in New Issue