diff --git a/[refs] b/[refs]
index fd942760353d..fae646a063a2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 698bf867d0d3b5669c4e85b29d2a44043a2c5c99
+refs/heads/master: 86aa7c1efc63e0969dee575ac9e021dbcbaa95c3
diff --git a/trunk/drivers/net/wireless/ath/ath6kl/htc_mbox.c b/trunk/drivers/net/wireless/ath/ath6kl/htc_mbox.c
index cd0e1ba410d6..ceaf92192658 100644
--- a/trunk/drivers/net/wireless/ath/ath6kl/htc_mbox.c
+++ b/trunk/drivers/net/wireless/ath/ath6kl/htc_mbox.c
@@ -2492,7 +2492,8 @@ static int ath6kl_htc_mbox_conn_service(struct htc_target *target,
 		max_msg_sz = le16_to_cpu(resp_msg->max_msg_sz);
 	}
 
-	if (assigned_ep >= ENDPOINT_MAX || !max_msg_sz) {
+	if (WARN_ON_ONCE(assigned_ep == ENDPOINT_UNUSED ||
+			 assigned_ep >= ENDPOINT_MAX || !max_msg_sz)) {
 		status = -ENOMEM;
 		goto fail_tx;
 	}