summaryrefslogtreecommitdiff
path: root/drivers/tty/vt
diff options
context:
space:
mode:
authorWang YanQing <udknight@gmail.com>2013-05-09 02:14:39 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-05-20 12:27:59 -0700
commit70125e76b0a7aec5035ca45076b96e5f9e230ef7 (patch)
treea009f959b4eec059facc5681dc925067546d4f8d /drivers/tty/vt
parent77d6c98454f0443f03ec690fb0ea25a26c01ddcb (diff)
fbcon: convert last two unregister_con_driver call to do_unregister_con_driver
There are only two place use unregister_con_driver now, this patch convert them to do_unregister_con_driver too, then we can delete unregister_con_driver whos function can be achieved with do_unregister_con_driver easily to reduce code size and duplication. Signed-off-by: Wang YanQing <udknight@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/vt')
-rw-r--r--drivers/tty/vt/vt.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/tty/vt/vt.c b/drivers/tty/vt/vt.c
index d5bfa869675b..8f4a71aa971e 100644
--- a/drivers/tty/vt/vt.c
+++ b/drivers/tty/vt/vt.c
@@ -3631,7 +3631,9 @@ EXPORT_SYMBOL_GPL(do_take_over_console);
*/
void give_up_console(const struct consw *csw)
{
- unregister_con_driver(csw);
+ console_lock();
+ do_unregister_con_driver(csw);
+ console_unlock();
}
static int __init vtconsole_class_init(void)