| Message ID | 20211025115353.5089-1-johan@kernel.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 5591c8f79db1729d9c5ac7f5b4d3a5c26e262d93 |
| Headers | show |
| Series | drm/udl: fix control-message timeout | expand |
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 >
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);
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(-)