projects
/
platform
/
kernel
/
linux-rpi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
3d68d6e
)
drm/udl: fix control-message timeout
author
Johan Hovold
<johan@kernel.org>
Mon, 25 Oct 2021 11:53:53 +0000
(13:53 +0200)
committer
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Fri, 26 Nov 2021 09:39:20 +0000
(10:39 +0100)
commit
5591c8f79db1729d9c5ac7f5b4d3a5c26e262d93
upstream.
USB control-message timeouts are specified in milliseconds and should
specifically not vary with CONFIG_HZ.
Fixes:
5320918b9a87
("drm/udl: initial UDL driver (v4)")
Cc: stable@vger.kernel.org # 3.4
Signed-off-by: Johan Hovold <johan@kernel.org>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link:
https://patchwork.freedesktop.org/patch/msgid/20211025115353.5089-1-johan@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/gpu/drm/udl/udl_connector.c
patch
|
blob
|
history
diff --git
a/drivers/gpu/drm/udl/udl_connector.c
b/drivers/gpu/drm/udl/udl_connector.c
index
cdc1c42
..
aac41a8
100644
(file)
--- a/
drivers/gpu/drm/udl/udl_connector.c
+++ b/
drivers/gpu/drm/udl/udl_connector.c
@@
-30,7
+30,7
@@
static int udl_get_edid_block(void *data, u8 *buf, unsigned int block,
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);