From: David S. Miller <davem@davemloft.net>
Date: Wed, 26 May 2010 06:51:17 +0000 (-0700)
Subject: sunserial: Don't call add_preferred_console() when console= is specified.
X-Git-Tag: firefly_0821_release~9833^2~1296^2~14
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=7c1f6afcf98fe95fb3f2b70ce01cf66f6db53b5e;p=firefly-linux-kernel-4.4.55.git

sunserial: Don't call add_preferred_console() when console= is specified.

Reported-by: Frans Pop <elendil@planet.nl>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/drivers/serial/suncore.c b/drivers/serial/suncore.c
index ed7d958b0a01..544f2e25d0e5 100644
--- a/drivers/serial/suncore.c
+++ b/drivers/serial/suncore.c
@@ -71,7 +71,9 @@ int sunserial_console_match(struct console *con, struct device_node *dp,
 
 	con->index = line;
 	drv->cons = con;
-	add_preferred_console(con->name, line, NULL);
+
+	if (!console_set_on_cmdline)
+		add_preferred_console(con->name, line, NULL);
 
 	return 1;
 }