projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
tty
/
vt
/
vt_ioctl.c
diff --git
a/drivers/tty/vt/vt_ioctl.c
b/drivers/tty/vt/vt_ioctl.c
index fc2c06c66e89d5e7536c5bb5387bc0fd9a837086..2bd78e2ac8ecba07dbf42788b6c61506ee8b2b20 100644
(file)
--- a/
drivers/tty/vt/vt_ioctl.c
+++ b/
drivers/tty/vt/vt_ioctl.c
@@
-289,13
+289,10
@@
static int vt_disallocate(unsigned int vc_num)
struct vc_data *vc = NULL;
int ret = 0;
- if (!vc_num)
- return 0;
-
console_lock();
if (VT_BUSY(vc_num))
ret = -EBUSY;
- else
+ else
if (vc_num)
vc = vc_deallocate(vc_num);
console_unlock();