mirror of
https://github.com/torvalds/linux.git
synced 2024-10-31 01:01:52 +00:00
USB: keyspan termios tidy
- Clear unsupported CMSPAR bit - Clean up long chains of a->b-> a bit - Encode baud rate back into tty structure properly Signed-off-by: Alan Cox <alan@redhat.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
parent
560aac22e1
commit
74240b07a9
@ -278,29 +278,35 @@ static void keyspan_set_termios (struct usb_serial_port *port,
|
||||
struct keyspan_port_private *p_priv;
|
||||
const struct keyspan_device_details *d_details;
|
||||
unsigned int cflag;
|
||||
struct tty_struct *tty = port->tty;
|
||||
|
||||
dbg("%s", __FUNCTION__);
|
||||
|
||||
p_priv = usb_get_serial_port_data(port);
|
||||
d_details = p_priv->device_details;
|
||||
cflag = port->tty->termios->c_cflag;
|
||||
cflag = tty->termios->c_cflag;
|
||||
device_port = port->number - port->serial->minor;
|
||||
|
||||
/* Baud rate calculation takes baud rate as an integer
|
||||
so other rates can be generated if desired. */
|
||||
baud_rate = tty_get_baud_rate(port->tty);
|
||||
baud_rate = tty_get_baud_rate(tty);
|
||||
/* If no match or invalid, don't change */
|
||||
if (baud_rate >= 0
|
||||
&& d_details->calculate_baud_rate(baud_rate, d_details->baudclk,
|
||||
if (d_details->calculate_baud_rate(baud_rate, d_details->baudclk,
|
||||
NULL, NULL, NULL, device_port) == KEYSPAN_BAUD_RATE_OK) {
|
||||
/* FIXME - more to do here to ensure rate changes cleanly */
|
||||
/* FIXME - calcuate exact rate from divisor ? */
|
||||
p_priv->baud = baud_rate;
|
||||
}
|
||||
} else
|
||||
baud_rate = tty_termios_baud_rate(old_termios);
|
||||
|
||||
tty_encode_baud_rate(tty, baud_rate, baud_rate);
|
||||
/* set CTS/RTS handshake etc. */
|
||||
p_priv->cflag = cflag;
|
||||
p_priv->flow_control = (cflag & CRTSCTS)? flow_cts: flow_none;
|
||||
|
||||
/* Mark/Space not supported */
|
||||
tty->termios->c_cflag &= ~CMSPAR;
|
||||
|
||||
keyspan_send_setup(port, 0);
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user