* [PATCH] drm/udl: fix control-message timeout
@ 2021-10-25 11:53 Johan Hovold
2021-11-05 10:15 ` Daniel Vetter
0 siblings, 1 reply; 2+ messages in thread
From: Johan Hovold @ 2021-10-25 11:53 UTC (permalink / raw)
To: Dave Airlie
Cc: Sean Paul, Thomas Zimmermann, Daniel Vetter, dri-devel,
linux-usb, linux-kernel, Johan Hovold, stable
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>
---
drivers/gpu/drm/udl/udl_connector.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/udl/udl_connector.c b/drivers/gpu/drm/udl/udl_connector.c
index 3750fd216131..930574ad2bca 100644
--- 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,
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, HZ);
+ 0xA1, read_buff, 2, 1000);
if (ret < 1) {
DRM_ERROR("Read EDID byte %d failed err %x\n", i, ret);
kfree(read_buff);
--
2.32.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] drm/udl: fix control-message timeout
2021-10-25 11:53 [PATCH] drm/udl: fix control-message timeout Johan Hovold
@ 2021-11-05 10:15 ` Daniel Vetter
0 siblings, 0 replies; 2+ messages in thread
From: Daniel Vetter @ 2021-11-05 10:15 UTC (permalink / raw)
To: Johan Hovold
Cc: Dave Airlie, Sean Paul, Thomas Zimmermann, Daniel Vetter,
dri-devel, linux-usb, linux-kernel, stable
On Mon, Oct 25, 2021 at 01:53:53PM +0200, Johan Hovold wrote:
> 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>
Thanks for patch, queued up for the merge window.
-Daniel
> ---
> drivers/gpu/drm/udl/udl_connector.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/udl/udl_connector.c b/drivers/gpu/drm/udl/udl_connector.c
> index 3750fd216131..930574ad2bca 100644
> --- 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,
> 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, HZ);
> + 0xA1, read_buff, 2, 1000);
> if (ret < 1) {
> DRM_ERROR("Read EDID byte %d failed err %x\n", i, ret);
> kfree(read_buff);
> --
> 2.32.0
>
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-11-05 10:15 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-10-25 11:53 [PATCH] drm/udl: fix control-message timeout Johan Hovold
2021-11-05 10:15 ` Daniel Vetter
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).