From b5c49f8e21880c95a76a9e4eed235debbf953b9f Mon Sep 17 00:00:00 2001
From: YAMANE Toshiaki <yamanetoshi@gmail.com>
Date: Sat, 10 Nov 2012 06:34:27 +0900
Subject: [PATCH] --- yaml --- r: 337823 b: refs/heads/master c:
 7028035d513ea7c1cc532c0f2b0e0808ebe5ccf6 h: refs/heads/master i:   337821:
 5e9503c7cf9d61679b144b94e1564ad00dda8ff2   337819:
 8c880578028b8782f3335de4ebaf0da9b61de8c2   337815:
 ca83169a45cf2bc49fa99bac2991200d4f2cc8e1   337807:
 c8a2c0f45e1a8cfa332b11ed13db18f1fdf47be7   337791:
 1b7bc676307fc04db5394863303da9c6194f21b0 v: v3

---
 [refs]                                        |  2 +-
 trunk/drivers/staging/serqt_usb2/serqt_usb2.c | 39 +++++++++++--------
 2 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/[refs] b/[refs]
index 9ab43be36688..292e4fa31aba 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 04e9d11beb49538458af005f703cb666fc1d3ccf
+refs/heads/master: 7028035d513ea7c1cc532c0f2b0e0808ebe5ccf6
diff --git a/trunk/drivers/staging/serqt_usb2/serqt_usb2.c b/trunk/drivers/staging/serqt_usb2/serqt_usb2.c
index 4c475edebc6a..f68a855199fc 100644
--- a/trunk/drivers/staging/serqt_usb2/serqt_usb2.c
+++ b/trunk/drivers/staging/serqt_usb2/serqt_usb2.c
@@ -1473,12 +1473,32 @@ static void qt_throttle(struct tty_struct *tty)
 	mutex_unlock(&qt_port->lock);
 }
 
+static void qt_submit_urb_from_unthrottle(struct usb_serial_port *port,
+					  struct usb_serial *serial)
+{
+	int result;
+
+	/* Start reading from the device */
+	usb_fill_bulk_urb(port->read_urb, serial->dev,
+			  usb_rcvbulkpipe(serial->dev,
+					  port->bulk_in_endpointAddress),
+			  port->read_urb->transfer_buffer,
+			  port->read_urb->transfer_buffer_length,
+			  qt_read_bulk_callback, port);
+
+	result = usb_submit_urb(port->read_urb, GFP_ATOMIC);
+
+	if (result)
+		dev_err(&port->dev,
+			"%s - failed restarting read urb, error %d\n",
+			__func__, result);
+}
+
 static void qt_unthrottle(struct tty_struct *tty)
 {
 	struct usb_serial_port *port = tty->driver_data;
 	struct usb_serial *serial = get_usb_serial(port, __func__);
 	struct quatech_port *qt_port;
-	unsigned int result;
 
 	if (!serial)
 		return;
@@ -1494,21 +1514,8 @@ static void qt_unthrottle(struct tty_struct *tty)
 		dev_dbg(&port->dev, "%s - qt_port->RxHolding = 0\n", __func__);
 
 		/* if we have a bulk endpoint, start it up */
-		if ((serial->num_bulk_in) && (qt_port->ReadBulkStopped == 1)) {
-			/* Start reading from the device */
-			usb_fill_bulk_urb(port->read_urb, serial->dev,
-					  usb_rcvbulkpipe(serial->dev,
-							  port->bulk_in_endpointAddress),
-					  port->read_urb->transfer_buffer,
-					  port->read_urb->
-					  transfer_buffer_length,
-					  qt_read_bulk_callback, port);
-			result = usb_submit_urb(port->read_urb, GFP_ATOMIC);
-			if (result)
-				dev_err(&port->dev,
-					"%s - failed restarting read urb, error %d\n",
-					__func__, result);
-		}
+		if ((serial->num_bulk_in) && (qt_port->ReadBulkStopped == 1))
+			qt_submit_urb_from_unthrottle(port, serial);
 	}
 	mutex_unlock(&qt_port->lock);
 }