Skip to contentSkip to conversation

most: fix control-message timeouts

PATCH New Johan Hovold 1 participant 1 message Oct 25, 2021

Subsystems (3)
Stable branch USB Most(r) technology driver
lore
Share & tools
lore

Johan Hovold

author
#0 lore raw

PATCH 1/1 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 97a6f772f36b ("drivers: most: add USB adapter driver")
Cc [email protected] # 5.9
Signed-off-by Johan Hovold <[email protected]>
---
 drivers/most/most_usb.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/most/most_usb.c +3 -2
index 2640c5b326a4..acabb7715b42 100644
@@ -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)
Signature · 1 line
2.32.0