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

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

media: em28xx: fix control-message timeouts 



commit d9b7e8df3aa9b8c10708aab60e72e79ac08237e4 upstream.

USB control-message timeouts are specified in milliseconds and should
specifically not vary with CONFIG_HZ.

Fixes: a6c2ba28 ("[PATCH] v4l: 716: support for em28xx board family")
Cc: stable@vger.kernel.org      # 2.6.16
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 81bc98cb

drivers/media/usb/em28xx/em28xx-core.c

+2 −2
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ int em28xx_read_reg_req_len(struct em28xx *dev, u8 req, u16 reg, 
	mutex_lock(&dev->ctrl_urb_lock);

	ret = usb_control_msg(dev->udev, pipe, req,

			      USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE,

			      0x0000, reg, dev->urb_buf, len, HZ);

			      0x0000, reg, dev->urb_buf, len, 1000);

	if (ret < 0) {

		if (reg_debug)

			printk(" failed!\n");
@@ -182,7 +182,7 @@ int em28xx_write_regs_req(struct em28xx *dev, u8 req, u16 reg, char *buf, 
	memcpy(dev->urb_buf, buf, len);

	ret = usb_control_msg(dev->udev, pipe, req,

			      USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE,

			      0x0000, reg, dev->urb_buf, len, HZ);

			      0x0000, reg, dev->urb_buf, len, 1000);

	mutex_unlock(&dev->ctrl_urb_lock);



	if (ret < 0)