aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb
diff options
context:
space:
mode:
authorJohan Hovold <jhovold@gmail.com>2013-05-27 08:44:44 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-05-28 21:50:44 -0400
commit5cbfa3acdcbf19e1d29cf3479ad8200d2e644e44 (patch)
treed016e931b5977803d994fc9cc0a4dbafdd88600b /drivers/usb
parent849513a7809175420d353625b6f651d961e99d49 (diff)
USB: zte_ev: fix control-message timeouts
The control-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')
-rw-r--r--drivers/usb/serial/zte_ev.c28
1 files changed, 14 insertions, 14 deletions
diff --git a/drivers/usb/serial/zte_ev.c b/drivers/usb/serial/zte_ev.c
index 39ee7373b4ee..b9a88f253636 100644
--- a/drivers/usb/serial/zte_ev.c
+++ b/drivers/usb/serial/zte_ev.c
@@ -53,7 +53,7 @@ static int zte_ev_usb_serial_open(struct tty_struct *tty,
53 result = usb_control_msg(udev, usb_sndctrlpipe(udev, 0), 53 result = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),
54 0x22, 0x21, 54 0x22, 0x21,
55 0x0001, 0x0000, NULL, len, 55 0x0001, 0x0000, NULL, len,
56 HZ * USB_CTRL_GET_TIMEOUT); 56 USB_CTRL_GET_TIMEOUT);
57 dev_dbg(dev, "result = %d\n", result); 57 dev_dbg(dev, "result = %d\n", result);
58 58
59 /* send 2st cmd and recieve data */ 59 /* send 2st cmd and recieve data */
@@ -65,7 +65,7 @@ static int zte_ev_usb_serial_open(struct tty_struct *tty,
65 result = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0), 65 result = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0),
66 0x21, 0xa1, 66 0x21, 0xa1,
67 0x0000, 0x0000, buf, len, 67 0x0000, 0x0000, buf, len,
68 HZ * USB_CTRL_GET_TIMEOUT); 68 USB_CTRL_GET_TIMEOUT);
69 debug_data(dev, __func__, len, buf, result); 69 debug_data(dev, __func__, len, buf, result);
70 70
71 /* send 3 cmd */ 71 /* send 3 cmd */
@@ -84,7 +84,7 @@ static int zte_ev_usb_serial_open(struct tty_struct *tty,
84 result = usb_control_msg(udev, usb_sndctrlpipe(udev, 0), 84 result = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),
85 0x20, 0x21, 85 0x20, 0x21,
86 0x0000, 0x0000, buf, len, 86 0x0000, 0x0000, buf, len,
87 HZ * USB_CTRL_GET_TIMEOUT); 87 USB_CTRL_GET_TIMEOUT);
88 debug_data(dev, __func__, len, buf, result); 88 debug_data(dev, __func__, len, buf, result);
89 89
90 /* send 4 cmd */ 90 /* send 4 cmd */
@@ -95,7 +95,7 @@ static int zte_ev_usb_serial_open(struct tty_struct *tty,
95 result = usb_control_msg(udev, usb_sndctrlpipe(udev, 0), 95 result = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),
96 0x22, 0x21, 96 0x22, 0x21,
97 0x0003, 0x0000, NULL, len, 97 0x0003, 0x0000, NULL, len,
98 HZ * USB_CTRL_GET_TIMEOUT); 98 USB_CTRL_GET_TIMEOUT);
99 dev_dbg(dev, "result = %d\n", result); 99 dev_dbg(dev, "result = %d\n", result);
100 100
101 /* send 5 cmd */ 101 /* send 5 cmd */
@@ -107,7 +107,7 @@ static int zte_ev_usb_serial_open(struct tty_struct *tty,
107 result = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0), 107 result = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0),
108 0x21, 0xa1, 108 0x21, 0xa1,
109 0x0000, 0x0000, buf, len, 109 0x0000, 0x0000, buf, len,
110 HZ * USB_CTRL_GET_TIMEOUT); 110 USB_CTRL_GET_TIMEOUT);
111 debug_data(dev, __func__, len, buf, result); 111 debug_data(dev, __func__, len, buf, result);
112 112
113 /* send 6 cmd */ 113 /* send 6 cmd */
@@ -126,7 +126,7 @@ static int zte_ev_usb_serial_open(struct tty_struct *tty,
126 result = usb_control_msg(udev, usb_sndctrlpipe(udev, 0), 126 result = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),
127 0x20, 0x21, 127 0x20, 0x21,
128 0x0000, 0x0000, buf, len, 128 0x0000, 0x0000, buf, len,
129 HZ * USB_CTRL_GET_TIMEOUT); 129 USB_CTRL_GET_TIMEOUT);
130 debug_data(dev, __func__, len, buf, result); 130 debug_data(dev, __func__, len, buf, result);
131 kfree(buf); 131 kfree(buf);
132 132
@@ -178,7 +178,7 @@ static void zte_ev_usb_serial_close(struct usb_serial_port *port)
178 result = usb_control_msg(udev, usb_sndctrlpipe(udev, 0), 178 result = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),
179 0x22, 0x21, 179 0x22, 0x21,
180 0x0002, 0x0000, NULL, len, 180 0x0002, 0x0000, NULL, len,
181 HZ * USB_CTRL_GET_TIMEOUT); 181 USB_CTRL_GET_TIMEOUT);
182 dev_dbg(dev, "result = %d\n", result); 182 dev_dbg(dev, "result = %d\n", result);
183 183
184 /* send 2st ctl cmd(CTL 21 22 03 00 00 00 00 00 ) */ 184 /* send 2st ctl cmd(CTL 21 22 03 00 00 00 00 00 ) */
@@ -186,7 +186,7 @@ static void zte_ev_usb_serial_close(struct usb_serial_port *port)
186 result = usb_control_msg(udev, usb_sndctrlpipe(udev, 0), 186 result = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),
187 0x22, 0x21, 187 0x22, 0x21,
188 0x0003, 0x0000, NULL, len, 188 0x0003, 0x0000, NULL, len,
189 HZ * USB_CTRL_GET_TIMEOUT); 189 USB_CTRL_GET_TIMEOUT);
190 dev_dbg(dev, "result = %d\n", result); 190 dev_dbg(dev, "result = %d\n", result);
191 191
192 /* send 3st cmd and recieve data */ 192 /* send 3st cmd and recieve data */
@@ -198,7 +198,7 @@ static void zte_ev_usb_serial_close(struct usb_serial_port *port)
198 result = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0), 198 result = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0),
199 0x21, 0xa1, 199 0x21, 0xa1,
200 0x0000, 0x0000, buf, len, 200 0x0000, 0x0000, buf, len,
201 HZ * USB_CTRL_GET_TIMEOUT); 201 USB_CTRL_GET_TIMEOUT);
202 debug_data(dev, __func__, len, buf, result); 202 debug_data(dev, __func__, len, buf, result);
203 203
204 /* send 4 cmd */ 204 /* send 4 cmd */
@@ -217,7 +217,7 @@ static void zte_ev_usb_serial_close(struct usb_serial_port *port)
217 result = usb_control_msg(udev, usb_sndctrlpipe(udev, 0), 217 result = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),
218 0x20, 0x21, 218 0x20, 0x21,
219 0x0000, 0x0000, buf, len, 219 0x0000, 0x0000, buf, len,
220 HZ * USB_CTRL_GET_TIMEOUT); 220 USB_CTRL_GET_TIMEOUT);
221 debug_data(dev, __func__, len, buf, result); 221 debug_data(dev, __func__, len, buf, result);
222 222
223 /* send 5 cmd */ 223 /* send 5 cmd */
@@ -228,7 +228,7 @@ static void zte_ev_usb_serial_close(struct usb_serial_port *port)
228 result = usb_control_msg(udev, usb_sndctrlpipe(udev, 0), 228 result = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),
229 0x22, 0x21, 229 0x22, 0x21,
230 0x0003, 0x0000, NULL, len, 230 0x0003, 0x0000, NULL, len,
231 HZ * USB_CTRL_GET_TIMEOUT); 231 USB_CTRL_GET_TIMEOUT);
232 dev_dbg(dev, "result = %d\n", result); 232 dev_dbg(dev, "result = %d\n", result);
233 233
234 /* send 6 cmd */ 234 /* send 6 cmd */
@@ -240,7 +240,7 @@ static void zte_ev_usb_serial_close(struct usb_serial_port *port)
240 result = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0), 240 result = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0),
241 0x21, 0xa1, 241 0x21, 0xa1,
242 0x0000, 0x0000, buf, len, 242 0x0000, 0x0000, buf, len,
243 HZ * USB_CTRL_GET_TIMEOUT); 243 USB_CTRL_GET_TIMEOUT);
244 debug_data(dev, __func__, len, buf, result); 244 debug_data(dev, __func__, len, buf, result);
245 245
246 /* send 7 cmd */ 246 /* send 7 cmd */
@@ -259,7 +259,7 @@ static void zte_ev_usb_serial_close(struct usb_serial_port *port)
259 result = usb_control_msg(udev, usb_sndctrlpipe(udev, 0), 259 result = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),
260 0x20, 0x21, 260 0x20, 0x21,
261 0x0000, 0x0000, buf, len, 261 0x0000, 0x0000, buf, len,
262 HZ * USB_CTRL_GET_TIMEOUT); 262 USB_CTRL_GET_TIMEOUT);
263 debug_data(dev, __func__, len, buf, result); 263 debug_data(dev, __func__, len, buf, result);
264 264
265 /* send 8 cmd */ 265 /* send 8 cmd */
@@ -270,7 +270,7 @@ static void zte_ev_usb_serial_close(struct usb_serial_port *port)
270 result = usb_control_msg(udev, usb_sndctrlpipe(udev, 0), 270 result = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),
271 0x22, 0x21, 271 0x22, 0x21,
272 0x0003, 0x0000, NULL, len, 272 0x0003, 0x0000, NULL, len,
273 HZ * USB_CTRL_GET_TIMEOUT); 273 USB_CTRL_GET_TIMEOUT);
274 dev_dbg(dev, "result = %d\n", result); 274 dev_dbg(dev, "result = %d\n", result);
275 275
276 kfree(buf); 276 kfree(buf);
generated by cgit v1.2.2 (git 2.25.0) at 2025-02-16 01:00:49 -0500