serial: sprd: check the right port and membase
When calling sprd_console_setup(), sprd_uart_port probably is NULL, we should check that first instead of checking its items directly. Also we should check membase to avoid accessing uart device before its initialization finished. Signed-off-by: Chunyan Zhang <chunyan.zhang@unisoc.com> Signed-off-by: Chunyan Zhang <zhang.lyra@gmail.com> Reviewed-by: Baolin Wang <baolin.wang@linaro.org> Tested-by: Baolin Wang <baolin.wang@linaro.org> Link: https://lore.kernel.org/r/20190826072929.7696-2-zhang.lyra@gmail.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Родитель
d2d8d4c049
Коммит
99038fe75a
|
@ -983,7 +983,7 @@ static void sprd_console_write(struct console *co, const char *s,
|
|||
|
||||
static int __init sprd_console_setup(struct console *co, char *options)
|
||||
{
|
||||
struct uart_port *port;
|
||||
struct sprd_uart_port *sprd_uart_port;
|
||||
int baud = 115200;
|
||||
int bits = 8;
|
||||
int parity = 'n';
|
||||
|
@ -992,15 +992,17 @@ static int __init sprd_console_setup(struct console *co, char *options)
|
|||
if (co->index >= UART_NR_MAX || co->index < 0)
|
||||
co->index = 0;
|
||||
|
||||
port = &sprd_port[co->index]->port;
|
||||
if (port == NULL) {
|
||||
sprd_uart_port = sprd_port[co->index];
|
||||
if (!sprd_uart_port || !sprd_uart_port->port.membase) {
|
||||
pr_info("serial port %d not yet initialized\n", co->index);
|
||||
return -ENODEV;
|
||||
}
|
||||
|
||||
if (options)
|
||||
uart_parse_options(options, &baud, &parity, &bits, &flow);
|
||||
|
||||
return uart_set_options(port, co, baud, parity, bits, flow);
|
||||
return uart_set_options(&sprd_uart_port->port, co, baud,
|
||||
parity, bits, flow);
|
||||
}
|
||||
|
||||
static struct uart_driver sprd_uart_driver;
|
||||
|
|
Загрузка…
Ссылка в новой задаче