diff options
Diffstat (limited to 'drivers/net/wireless/iwlegacy/4965-mac.c')
-rw-r--r-- | drivers/net/wireless/iwlegacy/4965-mac.c | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/drivers/net/wireless/iwlegacy/4965-mac.c b/drivers/net/wireless/iwlegacy/4965-mac.c index b251d34f0790..8930e7aa13a7 100644 --- a/drivers/net/wireless/iwlegacy/4965-mac.c +++ b/drivers/net/wireless/iwlegacy/4965-mac.c | |||
@@ -5384,12 +5384,8 @@ __il4965_down(struct il_priv *il) | |||
5384 | * clear all bits but the RF Kill bit and return */ | 5384 | * clear all bits but the RF Kill bit and return */ |
5385 | if (!il_is_init(il)) { | 5385 | if (!il_is_init(il)) { |
5386 | il->status = | 5386 | il->status = |
5387 | test_bit(S_RF_KILL_HW, | 5387 | test_bit(S_RF_KILL_HW, &il->status) << S_RF_KILL_HW | |
5388 | &il-> | 5388 | test_bit(S_GEO_CONFIGURED, &il->status) << S_GEO_CONFIGURED | |
5389 | status) << S_RF_KILL_HW | | ||
5390 | test_bit(S_GEO_CONFIGURED, | ||
5391 | &il-> | ||
5392 | status) << S_GEO_CONFIGURED | | ||
5393 | test_bit(S_EXIT_PENDING, &il->status) << S_EXIT_PENDING; | 5389 | test_bit(S_EXIT_PENDING, &il->status) << S_EXIT_PENDING; |
5394 | goto exit; | 5390 | goto exit; |
5395 | } | 5391 | } |
@@ -5397,13 +5393,9 @@ __il4965_down(struct il_priv *il) | |||
5397 | /* ...otherwise clear out all the status bits but the RF Kill | 5393 | /* ...otherwise clear out all the status bits but the RF Kill |
5398 | * bit and continue taking the NIC down. */ | 5394 | * bit and continue taking the NIC down. */ |
5399 | il->status &= | 5395 | il->status &= |
5400 | test_bit(S_RF_KILL_HW, | 5396 | test_bit(S_RF_KILL_HW, &il->status) << S_RF_KILL_HW | |
5401 | &il->status) << S_RF_KILL_HW | test_bit(S_GEO_CONFIGURED, | 5397 | test_bit(S_GEO_CONFIGURED, &il->status) << S_GEO_CONFIGURED | |
5402 | &il-> | 5398 | test_bit(S_FW_ERROR, &il->status) << S_FW_ERROR | |
5403 | status) << | ||
5404 | S_GEO_CONFIGURED | test_bit(S_FW_ERROR, | ||
5405 | &il-> | ||
5406 | status) << S_FW_ERROR | | ||
5407 | test_bit(S_EXIT_PENDING, &il->status) << S_EXIT_PENDING; | 5399 | test_bit(S_EXIT_PENDING, &il->status) << S_EXIT_PENDING; |
5408 | 5400 | ||
5409 | il4965_txq_ctx_stop(il); | 5401 | il4965_txq_ctx_stop(il); |