diff --git a/[refs] b/[refs]
index dc33669a8f31..e762b46c6ba1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4be929be34f9bdeffa40d815d32d7d60d2c7f03b
+refs/heads/master: 08a82c6872ac1d37cb993a52f1b35f97f48295bd
diff --git a/trunk/drivers/char/hvsi.c b/trunk/drivers/char/hvsi.c
index 793b236c9266..d4b14ff1c4c1 100644
--- a/trunk/drivers/char/hvsi.c
+++ b/trunk/drivers/char/hvsi.c
@@ -194,10 +194,8 @@ static inline void print_state(struct hvsi_struct *hp)
 		"HVSI_WAIT_FOR_MCTRL_RESPONSE",
 		"HVSI_FSP_DIED",
 	};
-	const char *name = state_names[hp->state];
-
-	if (hp->state > ARRAY_SIZE(state_names))
-		name = "UNKNOWN";
+	const char *name = (hp->state < ARRAY_SIZE(state_names))
+		? state_names[hp->state] : "UNKNOWN";
 
 	pr_debug("hvsi%i: state = %s\n", hp->index, name);
 #endif /* DEBUG */