From: Alan Cox Date: Thu, 18 Oct 2007 08:24:16 +0000 (-0700) Subject: serial: stop passing NULL to functions that expect data X-Git-Tag: v2.6.24-rc2~136^2~38 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=149b36eae2ab6aa6056664f4bc461f3d3affc9c1;p=linux-2.6-omap-h63xx.git serial: stop passing NULL to functions that expect data Earlier patches have removed the checking for old v new differences from the USB drivers so we can now pass in a valid blank old termios so that we don't to fill the drivers with magic hacks for console support Signed-off-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/serial/serial_core.c b/drivers/serial/serial_core.c index 103189095c8..3bb5d241dd4 100644 --- a/drivers/serial/serial_core.c +++ b/drivers/serial/serial_core.c @@ -1875,6 +1875,7 @@ uart_set_options(struct uart_port *port, struct console *co, int baud, int parity, int bits, int flow) { struct ktermios termios; + static struct ktermios dummy; int i; /* @@ -1920,7 +1921,7 @@ uart_set_options(struct uart_port *port, struct console *co, */ port->mctrl |= TIOCM_DTR; - port->ops->set_termios(port, &termios, NULL); + port->ops->set_termios(port, &termios, &dummy); co->cflag = termios.c_cflag; return 0;