|
@@ -2103,7 +2103,9 @@ static void __iwl4965_down(struct iwl_priv *priv)
|
|
|
test_bit(STATUS_GEO_CONFIGURED, &priv->status) <<
|
|
|
STATUS_GEO_CONFIGURED |
|
|
|
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;
|
|
|
}
|
|
|
|
|
@@ -2118,7 +2120,9 @@ static void __iwl4965_down(struct iwl_priv *priv)
|
|
|
test_bit(STATUS_IN_SUSPEND, &priv->status) <<
|
|
|
STATUS_IN_SUSPEND |
|
|
|
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);
|
|
|
iwl_clear_bit(priv, CSR_GP_CNTRL,
|