diff options
| author | Greg Kroah-Hartman | 2015-12-21 11:06:07 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2015-12-21 11:06:07 -0800 |
| commit | 462a1196a578fc6f52c26427070a75e044bbf9b1 (patch) | |
| tree | b24eca93de7e557d35b2da873efb2603ef79ce03 /drivers/tty/serial/earlycon.c | |
| parent | 58362d5be35216f196b4a4d16aa2c6ef938087f0 (diff) | |
| parent | 4ef7675344d687a0ef5b0d7c0cee12da005870c0 (diff) | |
Merge 4.4-rc6 into tty-next
We want the serial/tty fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/serial/earlycon.c')
| -rw-r--r-- | drivers/tty/serial/earlycon.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/tty/serial/earlycon.c b/drivers/tty/serial/earlycon.c index 07f7393210db..3f2423690d01 100644 --- a/drivers/tty/serial/earlycon.c +++ b/drivers/tty/serial/earlycon.c @@ -122,6 +122,7 @@ static int __init register_earlycon(char *buf, const struct earlycon_id *match) if (buf && !parse_options(&early_console_dev, buf)) buf = NULL; + spin_lock_init(&port->lock); port->uartclk = BASE_BAUD * 16; if (port->mapbase) port->membase = earlycon_map(port->mapbase, 64); @@ -209,6 +210,7 @@ int __init of_setup_earlycon(unsigned long addr, int err; struct uart_port *port = &early_console_dev.port; + spin_lock_init(&port->lock); port->iotype = UPIO_MEM; port->mapbase = addr; port->uartclk = BASE_BAUD * 16; |