Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5cbfa3ac authored by Johan Hovold's avatar Johan Hovold Committed by Greg Kroah-Hartman
Browse files

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: default avatarJohan Hovold <jhovold@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 849513a7

drivers/usb/serial/zte_ev.c

+14 −14
Original line number Original line Diff line number Diff line
@@ -53,7 +53,7 @@ static int zte_ev_usb_serial_open(struct tty_struct *tty, 
	result = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),

	result = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),

				 0x22, 0x21,

				 0x22, 0x21,

				 0x0001, 0x0000, NULL, len,

				 0x0001, 0x0000, NULL, len,

				 HZ * USB_CTRL_GET_TIMEOUT);

				 USB_CTRL_GET_TIMEOUT);

	dev_dbg(dev, "result = %d\n", result);

	dev_dbg(dev, "result = %d\n", result);





	/* send  2st cmd and recieve data */

	/* send  2st cmd and recieve data */
@@ -65,7 +65,7 @@ static int zte_ev_usb_serial_open(struct tty_struct *tty, 
	result = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0),

	result = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0),

				 0x21, 0xa1,

				 0x21, 0xa1,

				 0x0000, 0x0000, buf, len,

				 0x0000, 0x0000, buf, len,

				 HZ * USB_CTRL_GET_TIMEOUT);

				 USB_CTRL_GET_TIMEOUT);

	debug_data(dev, __func__, len, buf, result);

	debug_data(dev, __func__, len, buf, result);





	/* send 3 cmd */

	/* send 3 cmd */
@@ -84,7 +84,7 @@ static int zte_ev_usb_serial_open(struct tty_struct *tty, 
	result = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),

	result = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),

				 0x20, 0x21,

				 0x20, 0x21,

				 0x0000, 0x0000, buf, len,

				 0x0000, 0x0000, buf, len,

				 HZ * USB_CTRL_GET_TIMEOUT);

				 USB_CTRL_GET_TIMEOUT);

	debug_data(dev, __func__, len, buf, result);

	debug_data(dev, __func__, len, buf, result);





	/* send 4 cmd */

	/* send 4 cmd */
@@ -95,7 +95,7 @@ static int zte_ev_usb_serial_open(struct tty_struct *tty, 
	result = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),

	result = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),

				 0x22, 0x21,

				 0x22, 0x21,

				 0x0003, 0x0000, NULL, len,

				 0x0003, 0x0000, NULL, len,

				 HZ * USB_CTRL_GET_TIMEOUT);

				 USB_CTRL_GET_TIMEOUT);

	dev_dbg(dev, "result = %d\n", result);

	dev_dbg(dev, "result = %d\n", result);





	/* send 5 cmd */

	/* send 5 cmd */
@@ -107,7 +107,7 @@ static int zte_ev_usb_serial_open(struct tty_struct *tty, 
	result = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0),

	result = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0),

				 0x21, 0xa1,

				 0x21, 0xa1,

				 0x0000, 0x0000, buf, len,

				 0x0000, 0x0000, buf, len,

				 HZ * USB_CTRL_GET_TIMEOUT);

				 USB_CTRL_GET_TIMEOUT);

	debug_data(dev, __func__, len, buf, result);

	debug_data(dev, __func__, len, buf, result);





	/* send 6 cmd */

	/* send 6 cmd */
@@ -126,7 +126,7 @@ static int zte_ev_usb_serial_open(struct tty_struct *tty, 
	result = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),

	result = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),

				 0x20, 0x21,

				 0x20, 0x21,

				 0x0000, 0x0000, buf, len,

				 0x0000, 0x0000, buf, len,

				 HZ * USB_CTRL_GET_TIMEOUT);

				 USB_CTRL_GET_TIMEOUT);

	debug_data(dev, __func__, len, buf, result);

	debug_data(dev, __func__, len, buf, result);

	kfree(buf);

	kfree(buf);
@@ -178,7 +178,7 @@ static void zte_ev_usb_serial_close(struct usb_serial_port *port) 
	result = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),

	result = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),

				 0x22, 0x21,

				 0x22, 0x21,

				 0x0002, 0x0000, NULL, len,

				 0x0002, 0x0000, NULL, len,

				 HZ * USB_CTRL_GET_TIMEOUT);

				 USB_CTRL_GET_TIMEOUT);

	dev_dbg(dev, "result = %d\n", result);

	dev_dbg(dev, "result = %d\n", result);





	/* send 2st ctl cmd(CTL    21 22 03 00  00 00 00 00 ) */

	/* 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) 
	result = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),

	result = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),

				 0x22, 0x21,

				 0x22, 0x21,

				 0x0003, 0x0000, NULL, len,

				 0x0003, 0x0000, NULL, len,

				 HZ * USB_CTRL_GET_TIMEOUT);

				 USB_CTRL_GET_TIMEOUT);

	dev_dbg(dev, "result = %d\n", result);

	dev_dbg(dev, "result = %d\n", result);





	/* send  3st cmd and recieve data */

	/* send  3st cmd and recieve data */
@@ -198,7 +198,7 @@ static void zte_ev_usb_serial_close(struct usb_serial_port *port) 
	result = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0),

	result = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0),

				 0x21, 0xa1,

				 0x21, 0xa1,

				 0x0000, 0x0000, buf, len,

				 0x0000, 0x0000, buf, len,

				 HZ * USB_CTRL_GET_TIMEOUT);

				 USB_CTRL_GET_TIMEOUT);

	debug_data(dev, __func__, len, buf, result);

	debug_data(dev, __func__, len, buf, result);





	/* send 4 cmd */

	/* send 4 cmd */
@@ -217,7 +217,7 @@ static void zte_ev_usb_serial_close(struct usb_serial_port *port) 
	result = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),

	result = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),

				 0x20, 0x21,

				 0x20, 0x21,

				 0x0000, 0x0000, buf, len,

				 0x0000, 0x0000, buf, len,

				 HZ * USB_CTRL_GET_TIMEOUT);

				 USB_CTRL_GET_TIMEOUT);

	debug_data(dev, __func__, len, buf, result);

	debug_data(dev, __func__, len, buf, result);





	/* send 5 cmd */

	/* send 5 cmd */
@@ -228,7 +228,7 @@ static void zte_ev_usb_serial_close(struct usb_serial_port *port) 
	result = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),

	result = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),

				 0x22, 0x21,

				 0x22, 0x21,

				 0x0003, 0x0000, NULL, len,

				 0x0003, 0x0000, NULL, len,

				 HZ * USB_CTRL_GET_TIMEOUT);

				 USB_CTRL_GET_TIMEOUT);

	dev_dbg(dev, "result = %d\n", result);

	dev_dbg(dev, "result = %d\n", result);





	/* send 6 cmd */

	/* send 6 cmd */
@@ -240,7 +240,7 @@ static void zte_ev_usb_serial_close(struct usb_serial_port *port) 
	result = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0),

	result = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0),

				 0x21, 0xa1,

				 0x21, 0xa1,

				 0x0000, 0x0000, buf, len,

				 0x0000, 0x0000, buf, len,

				 HZ * USB_CTRL_GET_TIMEOUT);

				 USB_CTRL_GET_TIMEOUT);

	debug_data(dev, __func__, len, buf, result);

	debug_data(dev, __func__, len, buf, result);





	/* send 7 cmd */

	/* send 7 cmd */
@@ -259,7 +259,7 @@ static void zte_ev_usb_serial_close(struct usb_serial_port *port) 
	result = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),

	result = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),

				 0x20, 0x21,

				 0x20, 0x21,

				 0x0000, 0x0000, buf, len,

				 0x0000, 0x0000, buf, len,

				 HZ * USB_CTRL_GET_TIMEOUT);

				 USB_CTRL_GET_TIMEOUT);

	debug_data(dev, __func__, len, buf, result);

	debug_data(dev, __func__, len, buf, result);





	/* send 8 cmd */

	/* send 8 cmd */
@@ -270,7 +270,7 @@ static void zte_ev_usb_serial_close(struct usb_serial_port *port) 
	result = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),

	result = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),

				 0x22, 0x21,

				 0x22, 0x21,

				 0x0003, 0x0000, NULL, len,

				 0x0003, 0x0000, NULL, len,

				 HZ * USB_CTRL_GET_TIMEOUT);

				 USB_CTRL_GET_TIMEOUT);

	dev_dbg(dev, "result = %d\n", result);

	dev_dbg(dev, "result = %d\n", result);





	kfree(buf);

	kfree(buf);