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

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

media: stk1160: fix control-message timeouts 



commit 6aa6e70cdb5b863a57bad61310bf89b6617a5d2d upstream.

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

Fixes: 9cb2173e ("[media] media: Add stk1160 new driver (easycap replacement)")
Cc: stable@vger.kernel.org      # 3.7
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 0ac3d5f6

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

+2 −2
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ int stk1160_read_reg(struct stk1160 *dev, u16 reg, u8 *value) 
		return -ENOMEM;

	ret = usb_control_msg(dev->udev, pipe, 0x00,

			USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE,

			0x00, reg, buf, sizeof(u8), HZ);

			0x00, reg, buf, sizeof(u8), 1000);

	if (ret < 0) {

		stk1160_err("read failed on reg 0x%x (%d)\n",

			reg, ret);
@@ -85,7 +85,7 @@ int stk1160_write_reg(struct stk1160 *dev, u16 reg, u16 value) 


	ret =  usb_control_msg(dev->udev, pipe, 0x01,

			USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE,

			value, reg, NULL, 0, HZ);

			value, reg, NULL, 0, 1000);

	if (ret < 0) {

		stk1160_err("write failed on reg 0x%x (%d)\n",

			reg, ret);