1 files changed, 4 insertions, 5 deletions

diff --git a/drivers/tty/serial/samsung.c b/drivers/tty/serial/samsung.c
index f66f64829303..7ead42104c67 100644
--- a/drivers/tty/serial/samsung.c
+++ b/drivers/tty/serial/samsung.c
@@ -1416,10 +1416,8 @@ s3c24xx_serial_console_setup(struct console *co, char *options)
 
         /* is the port configured? */
 
-        if (port->mapbase == 0x0) {
-                co->index = 0;
-                port = &s3c24xx_serial_ports[co->index].port;
-        }
+        if (port->mapbase == 0x0)
+                return -ENODEV;
 
         cons_uart = port;
 
@@ -1451,7 +1449,8 @@ static struct console s3c24xx_serial_console = {
         .flags          = CON_PRINTBUFFER,
         .index          = -1,
         .write          = s3c24xx_serial_console_write,
-        .setup          = s3c24xx_serial_console_setup
+        .setup          = s3c24xx_serial_console_setup,
+        .data           = &s3c24xx_uart_drv,
 };
 
 int s3c24xx_serial_initconsole(struct platform_driver *drv,