---

yaml --- r: 354568 b: refs/heads/master c: fcdb6a2 h: refs/heads/master v: v3
git-mirror · Jan 18, 2013 · a1ef636 · a1ef636
1 parent cc0e8fd
commit a1ef636
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 13 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 77de2518e854501c1542199449354fab4b2377ac
+refs/heads/master: fcdb6a21903bcab0b5f788ba7eb0c31dd06040fd
diff --git a/trunk/drivers/usb/serial/io_ti.c b/trunk/drivers/usb/serial/io_ti.c
@@ -523,7 +523,6 @@ static int tx_active(struct edgeport_port *port)
 
 static void chase_port(struct edgeport_port *port, unsigned long timeout)
 {
-	int baud_rate;
 	struct tty_struct *tty = tty_port_tty_get(&port->port->port);
 	struct usb_serial *serial = port->port->serial;
 	wait_queue_t wait;
@@ -561,17 +560,6 @@ static void chase_port(struct edgeport_port *port, unsigned long timeout)
 			break;
 		msleep(10);
 	}
-
-	/* disconnected */
-	if (serial->disconnected)
-		return;
-
-	/* wait one more character time, based on baud rate */
-	/* (tx_active doesn't seem to wait for the last byte) */
-	baud_rate = port->baud_rate;
-	if (baud_rate == 0)
-		baud_rate = 50;
-	msleep(max(1, DIV_ROUND_UP(10000, baud_rate)));
 }
 
 static int choose_config(struct usb_device *dev)
@@ -1938,6 +1926,8 @@ static int edge_open(struct tty_struct *tty, struct usb_serial_port *port)
 
 	++edge_serial->num_ports_open;
 
+	port->port.drain_delay = 1;
+
 	goto release_es_lock;
 
 unlink_int_urb: