Commit f64b379b authored Oct 25, 2021 by Johan Hovold Committed by Greg Kroah-Hartman Jan 27, 2022

media: s2255: fix control-message timeouts



commit f71d272ad4e354097020a4e6b1dc6e4b59feb50f upstream.

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: 38f993ad ("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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 3a49cd73

drivers/media/usb/s2255/s2255drv.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -1884,7 +1884,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);
		@@ -1893,7 +1893,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;