summaryrefslogtreecommitdiffstats
path: root/drivers/tty/vt
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-06-24 15:17:53 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-06-24 15:17:53 -0700
commit805bf3daf361a501594f8b27b394a8d7372ebe3c (patch)
treec71fe689115c7fa0f270d31fcef75fe61d81318c /drivers/tty/vt
parent64e377dcd7d75c241d614458e9619d3445de44ef (diff)
parent9e895ace5d82df8929b16f58e9f515f6d54ab82d (diff)
Merge 3.10-rc7 into tty-next
We want the tty fixes in this branch as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/vt')
-rw-r--r--drivers/tty/vt/vt_ioctl.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/tty/vt/vt_ioctl.c b/drivers/tty/vt/vt_ioctl.c
index fc2c06c66e8..2bd78e2ac8e 100644
--- 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();