* [PATCH] Revert "serial: core: Use cons->index for preferred console registration"
@ 2019-10-16 10:36 Michal Simek
0 siblings, 0 replies; only message in thread
From: Michal Simek @ 2019-10-16 10:36 UTC (permalink / raw)
To: linux-kernel, monstr, michal.simek, git
Cc: Greg Kroah-Hartman, linux-serial, Jiri Slaby
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>
---
drivers/tty/serial/serial_core.c | 3 +--
1 file changed, 1 insertion(+), 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);
--
2.17.1
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2019-10-16 10:36 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-10-16 10:36 [PATCH] Revert "serial: core: Use cons->index for preferred console registration" Michal Simek
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).