Commit 7c1f6afc authored by David S. Miller's avatar David S. Miller

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

Reported-by: default avatarFrans Pop <elendil@planet.nl>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c87fe1c0
...@@ -71,7 +71,9 @@ int sunserial_console_match(struct console *con, struct device_node *dp, ...@@ -71,7 +71,9 @@ int sunserial_console_match(struct console *con, struct device_node *dp,
con->index = line; con->index = line;
drv->cons = con; drv->cons = con;
add_preferred_console(con->name, line, NULL);
if (!console_set_on_cmdline)
add_preferred_console(con->name, line, NULL);
return 1; return 1;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment