Skip to content

Commit

Permalink
sunsu: Use sunserial_console_termios() in sunsu_console_setup().
Browse files Browse the repository at this point in the history
Be like the other Sun serial drivers otherwise the special handling of
OpenFirmware options and hard-coded overrides for LOM/RSC consoles
will not be handled.

Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
David S. Miller committed Nov 24, 2009
1 parent 1917d17 commit be24656
Showing 1 changed file with 10 additions and 7 deletions.
17 changes: 10 additions & 7 deletions drivers/serial/sunsu.c
Original file line number Diff line number Diff line change
Expand Up @@ -1329,11 +1329,9 @@ static void sunsu_console_write(struct console *co, const char *s,
*/
static int __init sunsu_console_setup(struct console *co, char *options)
{
static struct ktermios dummy;
struct ktermios termios;
struct uart_port *port;
int baud = 9600;
int bits = 8;
int parity = 'n';
int flow = 'n';

printk("Console: ttyS%d (SU)\n",
(sunsu_reg.minor - 64) + co->index);
Expand All @@ -1352,10 +1350,15 @@ static int __init sunsu_console_setup(struct console *co, char *options)
*/
spin_lock_init(&port->lock);

if (options)
uart_parse_options(options, &baud, &parity, &bits, &flow);
/* Get firmware console settings. */
sunserial_console_termios(co, to_of_device(port->dev)->node);

return uart_set_options(port, co, baud, parity, bits, flow);
memset(&termios, 0, sizeof(struct ktermios));
termios.c_cflag = co->cflag;
port->mctrl |= TIOCM_DTR;
port->ops->set_termios(port, &termios, &dummy);

return 0;
}

static struct console sunsu_console = {
Expand Down

0 comments on commit be24656

Please sign in to comment.