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>

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();