Skip to content

Commit

Permalink
USB: io_ti: use tty-port drain delay
Browse files Browse the repository at this point in the history
Use tty-port drain delay rather than custom implementation in
chase_port.

Signed-off-by: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Johan Hovold authored and Greg Kroah-Hartman committed Jan 18, 2013
1 parent 77de251 commit fcdb6a2
Showing 1 changed file with 2 additions and 12 deletions.
14 changes: 2 additions & 12 deletions drivers/usb/serial/io_ti.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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:
Expand Down

0 comments on commit fcdb6a2

Please sign in to comment.