From: Jiri Slaby Date: Thu, 14 Jul 2011 12:35:11 +0000 (+0200) Subject: TTY: msm_serial, remove unneeded console set X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=e150c4ccbe7246c27b5208599fe9f6677c93b5fe;p=linux-beck.git TTY: msm_serial, remove unneeded console set It doesn't make sense to set console to uart_port in console->setup. At that time the console is set by uart_add_one_port already. The call chain looked like: uart_add_one_port() uport->cons = drv->cons; <= once uart_configure_port() register_console() console->setup() port->cons = co; <= second time Signed-off-by: Jiri Slaby Cc: Alan Cox Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/tty/serial/msm_serial.c b/drivers/tty/serial/msm_serial.c index e6ba83876508..29cbfd8c4e7c 100644 --- a/drivers/tty/serial/msm_serial.c +++ b/drivers/tty/serial/msm_serial.c @@ -804,8 +804,6 @@ static int __init msm_console_setup(struct console *co, char *options) if (unlikely(!port->membase)) return -ENXIO; - port->cons = co; - msm_init_clock(port); if (options)