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

Commit 17bda637 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 8f06bb8c

drivers/gpu/drm/udl/udl_connector.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -37,7 +37,7 @@ static u8 *udl_get_edid(struct udl_device *udl) 
		ret = usb_control_msg(udl->udev,

		ret = usb_control_msg(udl->udev,

				      usb_rcvctrlpipe(udl->udev, 0), (0x02),

				      usb_rcvctrlpipe(udl->udev, 0), (0x02),

				      (0x80 | (0x02 << 5)), i << 8, 0xA1, rbuf, 2,

				      (0x80 | (0x02 << 5)), i << 8, 0xA1, rbuf, 2,

				      HZ);

				      1000);

		if (ret < 1) {

		if (ret < 1) {

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

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

			goto error;

			goto error;