diff options
| author | Johan Hovold <jhovold@gmail.com> | 2013-05-27 14:44:42 +0200 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2013-06-19 02:16:51 +0100 |
| commit | ab85bbe6df2d4f3c983d9cc9429273a0f83e271d (patch) | |
| tree | c5e6c63540af04bd004ba6598b6d938b1fb29798 /drivers/usb/serial/iuu_phoenix.c | |
| parent | 56eb0cfb33b99dc253bc3743c418fb2814aa7981 (diff) | |
| download | kernel_samsung_smdk4412-ab85bbe6df2d4f3c983d9cc9429273a0f83e271d.zip kernel_samsung_smdk4412-ab85bbe6df2d4f3c983d9cc9429273a0f83e271d.tar.gz kernel_samsung_smdk4412-ab85bbe6df2d4f3c983d9cc9429273a0f83e271d.tar.bz2 | |
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>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'drivers/usb/serial/iuu_phoenix.c')
| -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 6aca631..cf2668e 100644 --- a/drivers/usb/serial/iuu_phoenix.c +++ b/drivers/usb/serial/iuu_phoenix.c @@ -327,7 +327,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); @@ -350,7 +350,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); |