media: s2255: fix control-message timeouts
USB control-message timeouts are specified in milliseconds and should
specifically not vary with CONFIG_HZ.
Use the common control-message timeout define for the five-second
timeouts.
Fixes: 38f993ad8b
("V4L/DVB (8125): This driver adds support for the Sensoray 2255 devices.")
Cc: stable@vger.kernel.org # 2.6.27
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:
Родитель
b82bf9b9dc
Коммит
f71d272ad4
|
@ -1882,7 +1882,7 @@ static long s2255_vendor_req(struct s2255_dev *dev, unsigned char Request,
|
|||
USB_TYPE_VENDOR | USB_RECIP_DEVICE |
|
||||
USB_DIR_IN,
|
||||
Value, Index, buf,
|
||||
TransferBufferLength, HZ * 5);
|
||||
TransferBufferLength, USB_CTRL_SET_TIMEOUT);
|
||||
|
||||
if (r >= 0)
|
||||
memcpy(TransferBuffer, buf, TransferBufferLength);
|
||||
|
@ -1891,7 +1891,7 @@ static long s2255_vendor_req(struct s2255_dev *dev, unsigned char Request,
|
|||
r = usb_control_msg(dev->udev, usb_sndctrlpipe(dev->udev, 0),
|
||||
Request, USB_TYPE_VENDOR | USB_RECIP_DEVICE,
|
||||
Value, Index, buf,
|
||||
TransferBufferLength, HZ * 5);
|
||||
TransferBufferLength, USB_CTRL_SET_TIMEOUT);
|
||||
}
|
||||
kfree(buf);
|
||||
return r;
|
||||
|
|
Загрузка…
Ссылка в новой задаче