From: Geert Uytterhoeven Date: Fri, 28 Feb 2014 13:21:32 +0000 (+0100) Subject: serial_core: Unregister console in uart_remove_one_port() X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=5f5c9ae56c38942623f69c3e6dc6ec78e4da2076;p=deliverable%2Flinux.git serial_core: Unregister console in uart_remove_one_port() If the serial port being removed is used as a console, it must also be unregistered from the console subsystem using unregister_console(). uart_ops.release_port() will release resources (e.g. iounmap() the serial port registers), causing a crash on subsequent kernel output if the console is still registered. Signed-off-by: Geert Uytterhoeven Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c index ece2049bd270..8ece7f14d89d 100644 --- a/drivers/tty/serial/serial_core.c +++ b/drivers/tty/serial/serial_core.c @@ -2676,6 +2676,12 @@ int uart_remove_one_port(struct uart_driver *drv, struct uart_port *uport) if (port->tty) tty_vhangup(port->tty); + /* + * If the port is used as a console, unregister it + */ + if (uart_console(uport)) + unregister_console(uport->cons); + /* * Free the port IO and memory resources, if any. */