summaryrefslogtreecommitdiffstats
path: root/drivers/tty/vt
diff options
context:
space:
mode:
authorWang YanQing <udknight@gmail.com>2013-05-08 20:14:07 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-05-20 21:27:58 +0200
commit618f2b90077ef22e5c7025fca4e9027bf75d918f (patch)
treec7c10973724e39f7091ca802620a966b6c9169e2 /drivers/tty/vt
parentvt: delete unneeded functions register_con_driver|take_over_console (diff)
downloadlinux-618f2b90077ef22e5c7025fca4e9027bf75d918f.tar.xz
linux-618f2b90077ef22e5c7025fca4e9027bf75d918f.zip
vt: convert last unbind_con_driver call to do_unbind_con_driver
There is only one place use unbind_con_driver, this patch convert it to do_unbind_con_driver too, then we can delete unbind_con_driver 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.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/tty/vt/vt.c b/drivers/tty/vt/vt.c
index 852d470d674b..a422322cf8b9 100644
--- a/drivers/tty/vt/vt.c
+++ b/drivers/tty/vt/vt.c
@@ -3303,8 +3303,11 @@ static int vt_unbind(struct con_driver *con)
if (first == 0 && last == MAX_NR_CONSOLES -1)
deflt = 1;
- if (first != -1)
- unbind_con_driver(csw, first, last, deflt);
+ if (first != -1) {
+ console_lock();
+ do_unbind_con_driver(csw, first, last, deflt);
+ console_unlock();
+ }
first = -1;
last = -1;