Commit 5b4e79ae authored by Maxime COQUELIN's avatar Maxime COQUELIN Committed by Greg Kroah-Hartman

serial: st-asc: Don't call BUG in asc_console_setup()

In order to prevent an asc instance to be used as early console, BUG_ON is
used on either mapbase or membase being NULL.

Problem is that this condition is also true when we set console to be a ttyASx
different to the first asc instance being probed.

Instead of calling BUG_ON, it now returns -ENXIO when either mapbase or
membase is NULL.
Signed-off-by: default avatarMaxime Coquelin <maxime.coquelin@st.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent af300539
...@@ -842,7 +842,8 @@ static int asc_console_setup(struct console *co, char *options) ...@@ -842,7 +842,8 @@ static int asc_console_setup(struct console *co, char *options)
* this to be called during the uart port registration when the * this to be called during the uart port registration when the
* driver gets probed and the port should be mapped at that point. * driver gets probed and the port should be mapped at that point.
*/ */
BUG_ON(ascport->port.mapbase == 0 || ascport->port.membase == NULL); if (ascport->port.mapbase == 0 || ascport->port.membase == NULL)
return -ENXIO;
if (options) if (options)
uart_parse_options(options, &baud, &parity, &bits, &flow); uart_parse_options(options, &baud, &parity, &bits, &flow);
......
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