summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWang YanQing <udknight@gmail.com>2013-05-09 02:14:21 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-05-20 12:27:59 -0700
commitc62a1e57e49d956fe45ee49197ba3bd5763c87ab (patch)
tree49ff6333bc449aa1a3cffa92568e8b30c33581bc
parentc1f5e38a5d3583b877619f95a922b607966dfc2e (diff)
downloadop-kernel-dev-c62a1e57e49d956fe45ee49197ba3bd5763c87ab.zip
op-kernel-dev-c62a1e57e49d956fe45ee49197ba3bd5763c87ab.tar.gz
vt: convert last bind_con_driver call to do_bind_con_driver
There is only one place use bind_con_driver now, this patch convert it to do_bind_con_driver too, then we can delete bind_con_driver whos function can be replaced by do_bind_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>
-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 164cbef..7e0953c 100644
--- a/drivers/tty/vt/vt.c
+++ b/drivers/tty/vt/vt.c
@@ -3236,8 +3236,11 @@ static int vt_bind(struct con_driver *con)
if (first == 0 && last == MAX_NR_CONSOLES -1)
deflt = 1;
- if (first != -1)
- bind_con_driver(csw, first, last, deflt);
+ if (first != -1) {
+ console_lock();
+ do_bind_con_driver(csw, first, last, deflt);
+ console_unlock();
+ }
first = -1;
last = -1;
OpenPOWER on IntegriCloud