diff options
| author | Johan Hovold <jhovold@gmail.com> | 2013-05-27 14:44:42 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-06-13 09:44:53 -0700 |
| commit | af90f015629d67c1172aff6baffdb99a0db3ad95 (patch) | |
| tree | fda4204bd4ae0e2500d1c63c40331bb55a1a60d6 | |
| parent | 395801f773ba978d4c0d3cb0675e534624ade228 (diff) | |
| download | lwn-af90f015629d67c1172aff6baffdb99a0db3ad95.tar.gz lwn-af90f015629d67c1172aff6baffdb99a0db3ad95.zip | |
USB: iuu_phoenix: fix bulk-message timeout
commit 6c13ff68a7ce01da7a51b44241a7aad8eaaedde7 upstream.
The bulk-message timeout is specified in milliseconds and should not
depend on HZ.
Signed-off-by: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -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 f2192d527db0..53c639c261c2 100644 --- a/drivers/usb/serial/iuu_phoenix.c +++ b/drivers/usb/serial/iuu_phoenix.c @@ -326,7 +326,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) dbg("%s - error = %2x", __func__, status); @@ -349,7 +349,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) dbg("%s - error = %2x", __func__, status); |