Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[firefly-linux-kernel-4.4.55.git] / drivers / net / wireless / mwl8k.c

diff --git a/drivers/net/wireless/mwl8k.c b/drivers/net/wireless/mwl8k.c
index 0640e7d7f0c2c06c0bee29b7009ebe472dd62095..956c1084ebf13ade0959fff0ad894a4910b60108 100644 (file)
--- a/drivers/net/wireless/mwl8k.c
+++ b/drivers/net/wireless/mwl8k.c
@@ -4807,16 +4807,14 @@ static int mwl8k_config(struct ieee80211_hw *hw, u32 changed)
        struct mwl8k_priv *priv = hw->priv;
        int rc;
 
-       if (conf->flags & IEEE80211_CONF_IDLE) {
-               mwl8k_cmd_radio_disable(hw);
-               return 0;
-       }
-
        rc = mwl8k_fw_lock(hw);
        if (rc)
                return rc;
 
-       rc = mwl8k_cmd_radio_enable(hw);
+       if (conf->flags & IEEE80211_CONF_IDLE)
+               rc = mwl8k_cmd_radio_disable(hw);
+       else
+               rc = mwl8k_cmd_radio_enable(hw);
        if (rc)
                goto out;