Commit 63b3e810 authored by Johan Hovold's avatar Johan Hovold Committed by Greg Kroah-Hartman
Browse files

most: fix control-message timeouts 



USB control-message timeouts are specified in milliseconds and should
specifically not vary with CONFIG_HZ.

Use the common control-message timeout defines for the five-second
timeouts.

Fixes: 97a6f772 ("drivers: most: add USB adapter driver")
Cc: stable@vger.kernel.org      # 5.9
Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
Link: https://lore.kernel.org/r/20211025115811.5410-1-johan@kernel.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a56d3e40

drivers/most/most_usb.c

+3 −2
Original line number Diff line number Diff line
@@ -149,7 +149,8 @@ static inline int drci_rd_reg(struct usb_device *dev, u16 reg, u16 *buf) 
	retval = usb_control_msg(dev, usb_rcvctrlpipe(dev, 0),

				 DRCI_READ_REQ, req_type,

				 0x0000,

				 reg, dma_buf, sizeof(*dma_buf), 5 * HZ);

				 reg, dma_buf, sizeof(*dma_buf),

				 USB_CTRL_GET_TIMEOUT);

	*buf = le16_to_cpu(*dma_buf);

	kfree(dma_buf);
@@ -176,7 +177,7 @@ static inline int drci_wr_reg(struct usb_device *dev, u16 reg, u16 data) 
			       reg,

			       NULL,

			       0,

			       5 * HZ);

			       USB_CTRL_SET_TIMEOUT);

}



static inline int start_sync_ep(struct usb_device *usb_dev, u16 ep)