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

Commit 7eea4364 authored by Borislav Petkov's avatar Borislav Petkov Committed by Linus Torvalds
Browse files

keyspan: init termios properly 



Remove redundant code leading to NULL ptr deref and let terminal config
settings take place in the proper initialization path in
usb_console_setup().

Signed-off-by: default avatarBorislav Petkov <bbpetkov@yahoo.de>
Cc: <lucy@keyspan.com>
Cc: Greg KH <greg@kroah.com>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 5bfeca31

drivers/usb/serial/keyspan.c

+6 −32
Original line number Diff line number Diff line
@@ -1220,9 +1220,7 @@ static int keyspan_open (struct usb_serial_port *port, struct file *filp) 
	struct usb_serial		*serial = port->serial;

	const struct keyspan_device_details	*d_details;

	int				i, err;

	int				baud_rate, device_port;

	struct urb			*urb;

	unsigned int			cflag;



	s_priv = usb_get_serial_data(serial);

	p_priv = usb_get_serial_port_data(port);
@@ -1265,30 +1263,6 @@ static int keyspan_open (struct usb_serial_port *port, struct file *filp) 
		/* usb_settoggle(urb->dev, usb_pipeendpoint(urb->pipe), usb_pipeout(urb->pipe), 0); */

	}



	/* get the terminal config for the setup message now so we don't 

	 * need to send 2 of them */



	cflag = port->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);

	/* If no match or invalid, leave as default */		

	if (baud_rate >= 0

	    && d_details->calculate_baud_rate(baud_rate, d_details->baudclk,

				NULL, NULL, NULL, device_port) == KEYSPAN_BAUD_RATE_OK) {

		p_priv->baud = baud_rate;

	}



	/* set CTS/RTS handshake etc. */

	p_priv->cflag = cflag;

	p_priv->flow_control = (cflag & CRTSCTS)? flow_cts: flow_none;



	keyspan_send_setup(port, 1);

	//mdelay(100);

	//keyspan_set_termios(port, NULL);



	return (0);

}