| From 6c13ff68a7ce01da7a51b44241a7aad8eaaedde7 Mon Sep 17 00:00:00 2001 |
| From: Johan Hovold <jhovold@gmail.com> |
| Date: Mon, 27 May 2013 14:44:42 +0200 |
| Subject: USB: iuu_phoenix: fix bulk-message timeout |
| |
| From: Johan Hovold <jhovold@gmail.com> |
| |
| 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> |
| |
| --- |
| drivers/usb/serial/iuu_phoenix.c | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| --- a/drivers/usb/serial/iuu_phoenix.c |
| +++ b/drivers/usb/serial/iuu_phoenix.c |
| @@ -289,7 +289,7 @@ static int bulk_immediate(struct usb_ser |
| 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); |
| @@ -309,7 +309,7 @@ static int read_immediate(struct usb_ser |
| 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); |
