diff options
| author |  Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| 2013-06-24 15:17:53 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| 2013-06-24 15:17:53 -0700 |
| commit | 805bf3daf361a501594f8b27b394a8d7372ebe3c (patch) | |
| tree | c71fe689115c7fa0f270d31fcef75fe61d81318c /drivers/tty/vt | |
| parent | tty: Reset itty for other pty (diff) | |
| parent | Linux 3.10-rc7 (diff) | |
| download | linux-805bf3daf361a501594f8b27b394a8d7372ebe3c.tar.gz linux-805bf3daf361a501594f8b27b394a8d7372ebe3c.tar.bz2 linux-805bf3daf361a501594f8b27b394a8d7372ebe3c.zip | |
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.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/tty/vt/vt_ioctl.c b/drivers/tty/vt/vt_ioctl.c index fc2c06c66e89..2bd78e2ac8ec 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(); |