1 files changed, 3 insertions, 10 deletions

diff --git a/drivers/net/wireless/ath/ath6kl/htc_mbox.c b/drivers/net/wireless/ath/ath6kl/htc_mbox.c
index cd0e1ba410d..fbb78dfe078 100644
--- a/drivers/net/wireless/ath/ath6kl/htc_mbox.c
+++ b/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;
         }
@@ -2655,12 +2656,6 @@ static int ath6kl_htc_mbox_wait_target(struct htc_target *target)
         struct htc_service_connect_resp resp;
         int status;
 
-        /* FIXME: remove once USB support is implemented */
-        if (target->dev->ar->hif_type == ATH6KL_HIF_TYPE_USB) {
-                ath6kl_err("HTC doesn't support USB yet. Patience!\n");
-                return -EOPNOTSUPP;
-        }
-
         /* we should be getting 1 control message that the target is ready */
         packet = htc_wait_for_ctrl_msg(target);
 
@@ -2890,9 +2885,7 @@ static void ath6kl_htc_mbox_cleanup(struct htc_target *target)
 {
         struct htc_packet *packet, *tmp_packet;
 
-        /* FIXME: remove check once USB support is implemented */
-        if (target->dev->ar->hif_type != ATH6KL_HIF_TYPE_USB)
-                ath6kl_hif_cleanup_scatter(target->dev->ar);
+        ath6kl_hif_cleanup_scatter(target->dev->ar);
 
         list_for_each_entry_safe(packet, tmp_packet,
                                  &target->free_ctrl_txbuf, list) {