Merge tag 'staging-3.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

[firefly-linux-kernel-4.4.55.git] / drivers / video / console / newport_con.c

diff --git a/drivers/video/console/newport_con.c b/drivers/video/console/newport_con.c
index b05afd03729eb7c1155aac758ea538948d81fb9f..a6ab9299813c9558dcf9e2cb2ec629e3b557e398 100644 (file)
--- a/drivers/video/console/newport_con.c
+++ b/drivers/video/console/newport_con.c
@@ -297,7 +297,7 @@ static void newport_exit(void)
                newport_set_def_font(i, NULL);
 }
 
-/* Can't be __init, take_over_console may call it later */
+/* Can't be __init, do_take_over_console may call it later */
 static const char *newport_startup(void)
 {
        int i;
@@ -746,6 +746,7 @@ static int newport_probe(struct gio_device *dev,
                         const struct gio_device_id *id)
 {
        unsigned long newport_addr;
+       int err;
 
        if (!dev->resource.start)
                return -EINVAL;
@@ -759,8 +760,10 @@ static int newport_probe(struct gio_device *dev,
 
        npregs = (struct newport_regs *)/* ioremap cannot fail */
                ioremap(newport_addr, sizeof(struct newport_regs));
-
-       return take_over_console(&newport_con, 0, MAX_NR_CONSOLES - 1, 1);
+       console_lock();
+       err = do_take_over_console(&newport_con, 0, MAX_NR_CONSOLES - 1, 1);
+       console_unlock();
+       return err;
 }
 
 static void newport_remove(struct gio_device *dev)