From 4a8fbe5a85fd31345a6287ffae78532892faa88e Mon Sep 17 00:00:00 2001 From: Mohamed Abbas Date: Mon, 30 Jun 2008 17:23:15 +0800 Subject: [PATCH] --- yaml --- r: 103285 b: refs/heads/master c: 052ec3f13973c789c89068573d3b06c983711d81 h: refs/heads/master i: 103283: 9dfb54a9279493d9be0673af46ac44042880cc38 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/iwlwifi/iwl4965-base.c | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 59bfafa94e31..73133b7ba4cb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9185159d3e29eb5ef15c125089fd40c36ce0c24f +refs/heads/master: 052ec3f13973c789c89068573d3b06c983711d81 diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl4965-base.c b/trunk/drivers/net/wireless/iwlwifi/iwl4965-base.c index 144b1daa9d7a..1b2d9f12a3a1 100644 --- a/trunk/drivers/net/wireless/iwlwifi/iwl4965-base.c +++ b/trunk/drivers/net/wireless/iwlwifi/iwl4965-base.c @@ -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,