OSDN Git Service
(root)
/
tomoyo
/
tomoyo-test1.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c020f66
)
drm/udl: Use USB timeout constant when reading EDID
author
Thomas Zimmermann
<tzimmermann@suse.de>
Thu, 6 Oct 2022 09:53:42 +0000
(11:53 +0200)
committer
Thomas Zimmermann
<tzimmermann@suse.de>
Fri, 7 Oct 2022 11:45:27 +0000
(13:45 +0200)
Set the USB control-message timeout to the USB default of 5 seconds.
Done for consistency with other uses of usb_control_msg() in udl and
other drivers.
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: Javier Martinez Canillas <javierm@redhat.com>
Link:
https://patchwork.freedesktop.org/patch/msgid/20221006095355.23579-4-tzimmermann@suse.de
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
e953982
..
cb3d682
100644
(file)
--- a/
drivers/gpu/drm/udl/udl_connector.c
+++ b/
drivers/gpu/drm/udl/udl_connector.c
@@
-31,7
+31,7
@@
static int udl_get_edid_block(void *data, u8 *buf, unsigned int block,
int bval = (i + block * EDID_LENGTH) << 8;
ret = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0),
0x02, (0x80 | (0x02 << 5)), bval,
- 0xA1, read_buff, 2,
1000
);
+ 0xA1, read_buff, 2,
USB_CTRL_GET_TIMEOUT
);
if (ret < 1) {
DRM_ERROR("Read EDID byte %d failed err %x\n", i, ret);
kfree(read_buff);