Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 01d1df29 authored by Alan Cox's avatar Alan Cox Committed by Greg Kroah-Hartman
Browse files

USB: whiteheat: clean up can't happen checks and encode baud rate 



Signed-off-by: default avatarAlan Cox <alan@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 33785091

drivers/usb/serial/whiteheat.c

+2 −9
Original line number Original line Diff line number Diff line
@@ -885,16 +885,7 @@ static int whiteheat_ioctl (struct usb_serial_port *port, struct file * file, un 
static void whiteheat_set_termios(struct usb_serial_port *port, struct ktermios *old_termios)

static void whiteheat_set_termios(struct usb_serial_port *port, struct ktermios *old_termios)

{

{

	dbg("%s -port %d", __FUNCTION__, port->number);

	dbg("%s -port %d", __FUNCTION__, port->number);



	if ((!port->tty) || (!port->tty->termios)) {

		dbg("%s - no tty structures", __FUNCTION__);

		goto exit;

	}

	

	firm_setup_port(port);

	firm_setup_port(port);



exit:

	return;

}

}
@@ -1244,6 +1235,8 @@ static int firm_setup_port(struct usb_serial_port *port) { 
	port_settings.baud = tty_get_baud_rate(port->tty);

	port_settings.baud = tty_get_baud_rate(port->tty);

	dbg("%s - baud rate = %d", __FUNCTION__, port_settings.baud);

	dbg("%s - baud rate = %d", __FUNCTION__, port_settings.baud);





	/* fixme: should set validated settings */

	tty_encode_baud_rate(port->tty, port_settings.baud, port_settings.baud);

	/* handle any settings that aren't specified in the tty structure */

	/* handle any settings that aren't specified in the tty structure */

	port_settings.lloop = 0;

	port_settings.lloop = 0;