[PATCH] Use consistent timeout in usb_control_msg()

The timeout argument is in microseconds, not in jiffies.  Use
USB_CTRL_GET_TIMEOUT in all usb_control_msg() calls.  It's 5 seconds,
and should be enough even for the slowest devices.

Signed-off-by: Pavel Roskin <proski@gnu.org>

1 files changed, 5 insertions, 3 deletions

diff --git a/at76_usb.c b/at76_usb.c
index 2d17558..51e9ff3 100644
--- a/at76_usb.c
+++ b/at76_usb.c
@@ -247,7 +247,7 @@ static int at76_dfu_download_block(struct dfu_ctx *ctx, u8 *buffer, int bytes,
 	result = usb_control_msg(udev, usb_sndctrlpipe(udev, 0), DFU_DNLOAD,
 				 USB_TYPE_CLASS | USB_DIR_OUT |
 				 USB_RECIP_INTERFACE, block, 0, tmpbuf, bytes,
-				 HZ);
+				 USB_CTRL_GET_TIMEOUT);
 	return result;
 }
 
@@ -259,7 +259,8 @@ static int at76_dfu_get_status(struct dfu_ctx *ctx, struct dfu_status *status)
 	result = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0), DFU_GETSTATUS,
 				 USB_TYPE_CLASS | USB_DIR_IN |
 				 USB_RECIP_INTERFACE, 0, 0, status,
-				 sizeof(struct dfu_status), HZ);
+				 sizeof(struct dfu_status),
+				 USB_CTRL_GET_TIMEOUT);
 	return result;
 }
 
@@ -269,7 +270,8 @@ static u8 at76_dfu_get_state(struct usb_device *udev, u8 *state)
 
 	result = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0), DFU_GETSTATE,
 				 USB_TYPE_CLASS | USB_DIR_IN |
-				 USB_RECIP_INTERFACE, 0, 0, state, 1, HZ);
+				 USB_RECIP_INTERFACE, 0, 0, state, 1,
+				 USB_CTRL_GET_TIMEOUT);
 	return result;
 }