Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3a49cd73 authored by Johan Hovold's avatar Johan Hovold Committed by Greg Kroah-Hartman
Browse files

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: ab33d507 ("V4L/DVB (3376): Add cpia2 camera support")
Cc: stable@vger.kernel.org      # 2.6.17
Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c9ef6e1d
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -550,7 +550,7 @@ static int write_packet(struct usb_device *udev,
			       0,	/* index */
			       buf,	/* buffer */
			       size,
			       HZ);
			       1000);

	kfree(buf);
	return ret;
@@ -582,7 +582,7 @@ static int read_packet(struct usb_device *udev,
			       0,	/* index */
			       buf,	/* buffer */
			       size,
			       HZ);
			       1000);

	if (ret >= 0)
		memcpy(registers, buf, size);