diff options
| author | Michal Simek | 2019-10-16 12:36:41 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2019-10-16 04:05:24 -0700 |
| commit | dd8b7a1db5d0dad985923f2bda418d619e8b0c5c (patch) | |
| tree | 9ba5c616f4a58c526e90b40c3bd8cb24f4ccad77 /drivers/tty | |
| parent | 6e73113784acf25b0b2d3eb316ab1c765a8858e4 (diff) | |
Revert "serial: core: Use cons->index for preferred console registration"
This reverts commit 91daae03188e0dd1da3c1b599df4ce7539d5a69f.
The origin patch is causing an issue on r8a7791/koelsch and
r8a7795/salvator-xs platforms where cons->index is not initialized to
expected value.
It is safer to revert this patch for now till it is clear why this is
happening.
Reported-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Link: https://lore.kernel.org/r/59f51af6bb03fce823663764d17ad0291aa01ab2.1571222199.git.michal.simek@xilinx.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty')
| -rw-r--r-- | drivers/tty/serial/serial_core.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c index b64ae2ca8bf2..c4a414a46c7f 100644 --- a/drivers/tty/serial/serial_core.c +++ b/drivers/tty/serial/serial_core.c @@ -2832,8 +2832,7 @@ int uart_add_one_port(struct uart_driver *drv, struct uart_port *uport) lockdep_set_class(&uport->lock, &port_lock_key); } if (uport->cons && uport->dev) - of_console_check(uport->dev->of_node, uport->cons->name, - uport->cons->index); + of_console_check(uport->dev->of_node, uport->cons->name, uport->line); uart_configure_port(drv, state, uport); |