projects
/
linux-edison.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
6343719
)
USB: iuu_phoenix: fix bulk-message timeout
author
Johan Hovold
<jhovold@gmail.com>
Mon, 27 May 2013 12:44:42 +0000
(14:44 +0200)
committer
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Wed, 29 May 2013 01:50:43 +0000
(10:50 +0900)
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>
drivers/usb/serial/iuu_phoenix.c
patch
|
blob
|
history
diff --git
a/drivers/usb/serial/iuu_phoenix.c
b/drivers/usb/serial/iuu_phoenix.c
index
9d74c27
..
790673e
100644
(file)
--- 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);