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

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

drm/udl: fix control-message timeout 



commit 5591c8f79db1729d9c5ac7f5b4d3a5c26e262d93 upstream.

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

Fixes: 5320918b ("drm/udl: initial UDL driver (v4)")
Cc: stable@vger.kernel.org      # 3.4
Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20211025115353.5089-1-johan@kernel.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b8a045e2

drivers/gpu/drm/udl/udl_connector.c

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ static bool udl_get_edid_block(struct udl_device *udl, int block_idx, 
		ret = usb_control_msg(udl->udev,

				      usb_rcvctrlpipe(udl->udev, 0),

					  (0x02), (0x80 | (0x02 << 5)), bval,

					  0xA1, read_buff, 2, HZ);

					  0xA1, read_buff, 2, 1000);

		if (ret < 1) {

			DRM_ERROR("Read EDID byte %d failed err %x\n", i, ret);

			kfree(read_buff);