]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
rsi_91x: fix structurally dead code
authorGustavo A. R. Silva <gustavo@embeddedor.com>
Thu, 26 Apr 2018 13:01:38 +0000 (08:01 -0500)
committerKalle Valo <kvalo@codeaurora.org>
Mon, 30 Apr 2018 10:32:51 +0000 (13:32 +0300)
Function rsi_hal_key_config returns before reaching code at line
922 if (status), hence this code is structurally dead.

Fix this by storing the value returned by rsi_hal_load_key
into _status_ for its further evaluation and use.

Addresses-Coverity-ID: 1468409 ("Structurally dead code")
Fixes: 4fd6c4762f37 ("rsi: roaming enhancements")
Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
drivers/net/wireless/rsi/rsi_91x_mac80211.c

index 766d874cc6e2acb05a1308d9ca0116a348b846c8..80e7f4f4f188f959a639fc8d0103fa11537cafd0 100644 (file)
@@ -911,14 +911,14 @@ static int rsi_hal_key_config(struct ieee80211_hw *hw,
                }
        }
 
-       return rsi_hal_load_key(adapter->priv,
-                               key->key,
-                               key->keylen,
-                               key_type,
-                               key->keyidx,
-                               key->cipher,
-                               sta_id,
-                               vif);
+       status = rsi_hal_load_key(adapter->priv,
+                                 key->key,
+                                 key->keylen,
+                                 key_type,
+                                 key->keyidx,
+                                 key->cipher,
+                                 sta_id,
+                                 vif);
        if (status)
                return status;