aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/serial/whiteheat.c
diff options
context:
space:
mode:
authorAlan Cox <alan@lxorguk.ukuu.org.uk>2007-10-18 04:24:23 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2007-10-25 15:18:42 -0400
commit01d1df29517625b8e8b5f48a0d3c2020d950eb4b (patch)
tree97eb968ccbf59b8d7014e8741cb5accb5d8a5aec /drivers/usb/serial/whiteheat.c
parent337850917a690ca83605b30b29c464bb3397abdf (diff)
USB: whiteheat: clean up can't happen checks and encode baud rate
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>
Diffstat (limited to 'drivers/usb/serial/whiteheat.c')
-rw-r--r--drivers/usb/serial/whiteheat.c11
1 files changed, 2 insertions, 9 deletions
diff --git a/drivers/usb/serial/whiteheat.c b/drivers/usb/serial/whiteheat.c
index cc8b44c08712..ee5dd8b5a713 100644
--- a/drivers/usb/serial/whiteheat.c
+++ b/drivers/usb/serial/whiteheat.c
@@ -885,16 +885,7 @@ static int whiteheat_ioctl (struct usb_serial_port *port, struct file * file, un
885static void whiteheat_set_termios(struct usb_serial_port *port, struct ktermios *old_termios) 885static void whiteheat_set_termios(struct usb_serial_port *port, struct ktermios *old_termios)
886{ 886{
887 dbg("%s -port %d", __FUNCTION__, port->number); 887 dbg("%s -port %d", __FUNCTION__, port->number);
888
889 if ((!port->tty) || (!port->tty->termios)) {
890 dbg("%s - no tty structures", __FUNCTION__);
891 goto exit;
892 }
893
894 firm_setup_port(port); 888 firm_setup_port(port);
895
896exit:
897 return;
898} 889}
899 890
900 891
@@ -1244,6 +1235,8 @@ static int firm_setup_port(struct usb_serial_port *port) {
1244 port_settings.baud = tty_get_baud_rate(port->tty); 1235 port_settings.baud = tty_get_baud_rate(port->tty);
1245 dbg("%s - baud rate = %d", __FUNCTION__, port_settings.baud); 1236 dbg("%s - baud rate = %d", __FUNCTION__, port_settings.baud);
1246 1237
1238 /* fixme: should set validated settings */
1239 tty_encode_baud_rate(port->tty, port_settings.baud, port_settings.baud);
1247 /* handle any settings that aren't specified in the tty structure */ 1240 /* handle any settings that aren't specified in the tty structure */
1248 port_settings.lloop = 0; 1241 port_settings.lloop = 0;
1249 1242