diff options
| author | Jeffrey Hugo <jhugo@codeaurora.org> | 2019-02-17 06:05:52 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-02-19 13:42:08 +0100 |
| commit | be24c270185930997b55e20a859a954b2f4eaa46 (patch) | |
| tree | e9136c459a84882e56f9c2fe9cb6b731e0e40f18 | |
| parent | tty: serial: samsung: Enable baud clock during initialisation (diff) | |
| download | linux-be24c270185930997b55e20a859a954b2f4eaa46.tar.xz linux-be24c270185930997b55e20a859a954b2f4eaa46.zip | |
tty: serial: msm_serial: Remove __init from msm_console_setup()
Due to the complexities of modern Qualcomm SoCs, about a half dozen drivers
must successfully probe before the clocks for the console are present, and
the console can successfully probe. Depending on several random factors
such as probe order and modules vs builtin, msm_serial may not be able to
successfully probe for some, at which point, __init annotated functions
may become unmapped. If this occurs, msm_console_setup() will be called
from the probe path, but will no longer exist, resulting in a kernel
panic.
Resolve this issue by removing the __init annotation from
msm_console_setup().
Signed-off-by: Jeffrey Hugo <jhugo@codeaurora.org>
Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/tty/serial/msm_serial.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/tty/serial/msm_serial.c b/drivers/tty/serial/msm_serial.c index 736b74fd6623..109096033bb1 100644 --- a/drivers/tty/serial/msm_serial.c +++ b/drivers/tty/serial/msm_serial.c @@ -1634,7 +1634,7 @@ static void msm_console_write(struct console *co, const char *s, __msm_console_write(port, s, count, msm_port->is_uartdm); } -static int __init msm_console_setup(struct console *co, char *options) +static int msm_console_setup(struct console *co, char *options) { struct uart_port *port; int baud = 115200; |