Merge 4.7-rc6 into tty-next

We want the tty/serial fixes in here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

2 files changed, 6 insertions, 2 deletions

diff --git a/drivers/tty/pty.c b/drivers/tty/pty.c
index f856c4544eea..51e0d32883ba 100644
--- a/drivers/tty/pty.c
+++ b/drivers/tty/pty.c
@@ -667,8 +667,11 @@ static void pty_unix98_remove(struct tty_driver *driver, struct tty_struct *tty)
                 fsi = tty->driver_data;
         else
                 fsi = tty->link->driver_data;
-        devpts_kill_index(fsi, tty->index);
-        devpts_release(fsi);
+
+        if (fsi) {
+                devpts_kill_index(fsi, tty->index);
+                devpts_release(fsi);
+        }
 }
 
 static const struct tty_operations ptm_unix98_ops = {
diff --git a/drivers/tty/vt/vt.c b/drivers/tty/vt/vt.c
index 213ce24060b5..2705ca960e92 100644
--- a/drivers/tty/vt/vt.c
+++ b/drivers/tty/vt/vt.c
@@ -744,6 +744,7 @@ static void visual_init(struct vc_data *vc, int num, int init)
         vc->vc_complement_mask = 0;
         vc->vc_can_do_color = 0;
         vc->vc_panic_force_write = false;
+        vc->vc_cur_blink_ms = DEFAULT_CURSOR_BLINK_MS;
         vc->vc_sw->con_init(vc, init);
         if (!vc->vc_complement_mask)
                 vc->vc_complement_mask = vc->vc_can_do_color ? 0x7700 : 0x0800;