Commit 052ec3f1 authored by Mohamed Abbas's avatar Mohamed Abbas Committed by John W. Linville

iwlwifi: keep the STATUS_EXIT_PENDING flag till the end of down flow

This patch avoids unsetting STATUS_EXIT_PENDING in the middle of the
down flow.
Signed-off-by: default avatarMohamed Abbas <mohamed.abbas@intel.com>
Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: default avatarZhu Yi <yi.zhu@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 9185159d
...@@ -2103,7 +2103,9 @@ static void __iwl4965_down(struct iwl_priv *priv) ...@@ -2103,7 +2103,9 @@ static void __iwl4965_down(struct iwl_priv *priv)
test_bit(STATUS_GEO_CONFIGURED, &priv->status) << test_bit(STATUS_GEO_CONFIGURED, &priv->status) <<
STATUS_GEO_CONFIGURED | STATUS_GEO_CONFIGURED |
test_bit(STATUS_IN_SUSPEND, &priv->status) << test_bit(STATUS_IN_SUSPEND, &priv->status) <<
STATUS_IN_SUSPEND; STATUS_IN_SUSPEND |
test_bit(STATUS_EXIT_PENDING, &priv->status) <<
STATUS_EXIT_PENDING;
goto exit; goto exit;
} }
...@@ -2118,7 +2120,9 @@ static void __iwl4965_down(struct iwl_priv *priv) ...@@ -2118,7 +2120,9 @@ static void __iwl4965_down(struct iwl_priv *priv)
test_bit(STATUS_IN_SUSPEND, &priv->status) << test_bit(STATUS_IN_SUSPEND, &priv->status) <<
STATUS_IN_SUSPEND | STATUS_IN_SUSPEND |
test_bit(STATUS_FW_ERROR, &priv->status) << test_bit(STATUS_FW_ERROR, &priv->status) <<
STATUS_FW_ERROR; STATUS_FW_ERROR |
test_bit(STATUS_EXIT_PENDING, &priv->status) <<
STATUS_EXIT_PENDING;
spin_lock_irqsave(&priv->lock, flags); spin_lock_irqsave(&priv->lock, flags);
iwl_clear_bit(priv, CSR_GP_CNTRL, iwl_clear_bit(priv, CSR_GP_CNTRL,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment