summaryrefslogtreecommitdiffstats
path: root/drivers/tty/serial
diff options
context:
space:
mode:
authorMichal Simek <michal.simek@xilinx.com>2019-10-16 12:36:41 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-10-16 13:05:24 +0200
commitdd8b7a1db5d0dad985923f2bda418d619e8b0c5c (patch)
tree9ba5c616f4a58c526e90b40c3bd8cb24f4ccad77 /drivers/tty/serial
parentserial: 8250_exar: Move Exar pieces to custom ->startup() (diff)
downloadlinux-dd8b7a1db5d0dad985923f2bda418d619e8b0c5c.tar.xz
linux-dd8b7a1db5d0dad985923f2bda418d619e8b0c5c.zip
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/serial')
-rw-r--r--drivers/tty/serial/serial_core.c3
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);