iwlwifi: fix spinlock used before initialized

The patch fixes spinlock priv->lock (apm_ops.init) is used before it has
been initialized.

Signed-off-by: Ron Rindjunsky <ron.rindjunsky@intel.com>
Signed-off-by: Zhu Yi <yi.zhu@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

2 files changed, 1 insertions, 5 deletions

diff --git a/drivers/net/wireless/iwlwifi/iwl-4965.c b/drivers/net/wireless/iwlwifi/iwl-4965.c
index 126ecf7023eb..0b4413830507 100644
--- a/drivers/net/wireless/iwlwifi/iwl-4965.c
+++ b/drivers/net/wireless/iwlwifi/iwl-4965.c
@@ -489,10 +489,8 @@ static int iwl4965_disable_tx_fifo(struct iwl_priv *priv)
 
 static int iwl4965_apm_init(struct iwl_priv *priv)
 {
-        unsigned long flags;
         int ret = 0;
 
-        spin_lock_irqsave(&priv->lock, flags);
         iwl_set_bit(priv, CSR_GIO_CHICKEN_BITS,
                           CSR_GIO_CHICKEN_BITS_REG_BIT_DIS_L0S_EXIT_TIMER);
 
@@ -524,7 +522,6 @@ static int iwl4965_apm_init(struct iwl_priv *priv)
 
         iwl_release_nic_access(priv);
 out:
-        spin_unlock_irqrestore(&priv->lock, flags);
         return ret;
 }
 
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.c b/drivers/net/wireless/iwlwifi/iwl-core.c
index aab0ee6d8af4..7759e63b2bcf 100644
--- a/drivers/net/wireless/iwlwifi/iwl-core.c
+++ b/drivers/net/wireless/iwlwifi/iwl-core.c
@@ -174,9 +174,8 @@ int iwl_hw_nic_init(struct iwl_priv *priv)
         int ret;
 
         /* nic_init */
-        priv->cfg->ops->lib->apm_ops.init(priv);
-
         spin_lock_irqsave(&priv->lock, flags);
+        priv->cfg->ops->lib->apm_ops.init(priv);
         iwl_write32(priv, CSR_INT_COALESCING, 512 / 32);
         spin_unlock_irqrestore(&priv->lock, flags);