diff --git a/[refs] b/[refs]
index 7a08e2440421..05e7a68234d1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 825e037fb8912f38e9d9ddd3ec79fa7c584db708
+refs/heads/master: 229395c90aadbadef76bacf52b9cb3326f509e93
diff --git a/trunk/drivers/char/hvsi.c b/trunk/drivers/char/hvsi.c
index 41db8060e8f7..54cbb58b8740 100644
--- a/trunk/drivers/char/hvsi.c
+++ b/trunk/drivers/char/hvsi.c
@@ -311,7 +311,8 @@ static void hvsi_recv_control(struct hvsi_struct *hp, uint8_t *packet,
 				/* CD went away; no more connection */
 				pr_debug("hvsi%i: CD dropped\n", hp->index);
 				hp->mctrl &= TIOCM_CD;
-				if (!(hp->tty->flags & CLOCAL))
+				/* If userland hasn't done an open(2) yet, hp->tty is NULL. */
+				if (hp->tty && !(hp->tty->flags & CLOCAL))
 					*to_hangup = hp->tty;
 			}
 			break;