diff options
| author | Johan Hovold <jhovold@gmail.com> | 2013-05-27 14:44:42 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-05-29 10:50:43 +0900 |
| commit | 6c13ff68a7ce01da7a51b44241a7aad8eaaedde7 (patch) | |
| tree | 6b30dae2abb3d9c2ed3ea8bbaac72048a5d500fe /drivers/usb/serial | |
| parent | 634371911730a462626071065b64cd6e1fe213e0 (diff) | |
| download | linux-3.10-6c13ff68a7ce01da7a51b44241a7aad8eaaedde7.tar.gz linux-3.10-6c13ff68a7ce01da7a51b44241a7aad8eaaedde7.tar.bz2 linux-3.10-6c13ff68a7ce01da7a51b44241a7aad8eaaedde7.zip | |
USB: iuu_phoenix: fix bulk-message timeout
The bulk-message timeout is specified in milliseconds and should not
depend on HZ.
Cc: stable@vger.kernel.org
Signed-off-by: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/serial')
| -rw-r--r-- | drivers/usb/serial/iuu_phoenix.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/serial/iuu_phoenix.c b/drivers/usb/serial/iuu_phoenix.c index 9d74c278b7b..790673e5faa 100644 --- a/drivers/usb/serial/iuu_phoenix.c +++ b/drivers/usb/serial/iuu_phoenix.c @@ -287,7 +287,7 @@ static int bulk_immediate(struct usb_serial_port *port, u8 *buf, u8 count) usb_bulk_msg(serial->dev, usb_sndbulkpipe(serial->dev, port->bulk_out_endpointAddress), buf, - count, &actual, HZ * 1); + count, &actual, 1000); if (status != IUU_OPERATION_OK) dev_dbg(&port->dev, "%s - error = %2x\n", __func__, status); @@ -307,7 +307,7 @@ static int read_immediate(struct usb_serial_port *port, u8 *buf, u8 count) usb_bulk_msg(serial->dev, usb_rcvbulkpipe(serial->dev, port->bulk_in_endpointAddress), buf, - count, &actual, HZ * 1); + count, &actual, 1000); if (status != IUU_OPERATION_OK) dev_dbg(&port->dev, "%s - error = %2x\n", __func__, status); |