1 files changed, 12 insertions, 4 deletions

diff --git a/drivers/net/wireless/ath/ath9k/rc.c b/drivers/net/wireless/ath/ath9k/rc.c
index ba06e78b2f50..d7f403080f7a 100644
--- a/drivers/net/wireless/ath/ath9k/rc.c
+++ b/drivers/net/wireless/ath/ath9k/rc.c
@@ -741,10 +741,18 @@ static u8 ath_rc_ratefind_ht(struct ath_softc *sc,
         if (rate > (ath_rc_priv->rate_table_size - 1))
                 rate = ath_rc_priv->rate_table_size - 1;
 
-        ASSERT((rate_table->info[rate].valid &&
-                (ath_rc_priv->ht_cap & WLAN_RC_DS_FLAG)) ||
-               (rate_table->info[rate].valid_single_stream &&
-                !(ath_rc_priv->ht_cap & WLAN_RC_DS_FLAG)));
+        if (rate_table->info[rate].valid &&
+            (ath_rc_priv->ht_cap & WLAN_RC_DS_FLAG))
+                return rate;
+
+        if (rate_table->info[rate].valid_single_stream &&
+            !(ath_rc_priv->ht_cap & WLAN_RC_DS_FLAG));
+                return rate;
+
+        /* This should not happen */
+        WARN_ON(1);
+
+        rate = ath_rc_priv->valid_rate_index[0];
 
         return rate;
 }