diff --git a/[refs] b/[refs]
index bf4e307d4fbf..bc5162de791f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6826a57d1abc8ac9f59b24f1a008554c6560a995
+refs/heads/master: 728656506447b3b349d082a7fb99445f9cb0caaa
diff --git a/trunk/drivers/char/hvsi.c b/trunk/drivers/char/hvsi.c
index 2989056a9e39..793b236c9266 100644
--- a/trunk/drivers/char/hvsi.c
+++ b/trunk/drivers/char/hvsi.c
@@ -1230,11 +1230,12 @@ static struct tty_driver *hvsi_console_device(struct console *console,
 
 static int __init hvsi_console_setup(struct console *console, char *options)
 {
-	struct hvsi_struct *hp = &hvsi_ports[console->index];
+	struct hvsi_struct *hp;
 	int ret;
 
 	if (console->index < 0 || console->index >= hvsi_count)
 		return -1;
+	hp = &hvsi_ports[console->index];
 
 	/* give the FSP a chance to change the baud rate when we re-open */
 	hvsi_close_protocol(hp);