iwleagcy: fix ident code damage

[mv-sheeva.git] / drivers / net / wireless / iwlegacy / 4965-mac.c

diff --git a/drivers/net/wireless/iwlegacy/4965-mac.c b/drivers/net/wireless/iwlegacy/4965-mac.c
index b251d34f0790dca78491d8d0cbdaf92a46f6ebb6..8930e7aa13a75d8a4d6dc9a32c62edf7956206b8 100644 (file)
--- 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)
         * clear all bits but the RF Kill bit and return */
        if (!il_is_init(il)) {
                il->status =
-                   test_bit(S_RF_KILL_HW,
-                            &il->
-                            status) << S_RF_KILL_HW |
-                   test_bit(S_GEO_CONFIGURED,
-                            &il->
-                            status) << S_GEO_CONFIGURED |
+                   test_bit(S_RF_KILL_HW, &il->status) << S_RF_KILL_HW |
+                   test_bit(S_GEO_CONFIGURED, &il->status) << S_GEO_CONFIGURED |
                    test_bit(S_EXIT_PENDING, &il->status) << S_EXIT_PENDING;
                goto exit;
        }
@@ -5397,13 +5393,9 @@ __il4965_down(struct il_priv *il)
        /* ...otherwise clear out all the status bits but the RF Kill
         * bit and continue taking the NIC down. */
        il->status &=
-           test_bit(S_RF_KILL_HW,
-                    &il->status) << S_RF_KILL_HW | test_bit(S_GEO_CONFIGURED,
-                                                            &il->
-                                                            status) <<
-           S_GEO_CONFIGURED | test_bit(S_FW_ERROR,
-                                       &il->
-                                       status) << S_FW_ERROR |
+           test_bit(S_RF_KILL_HW, &il->status) << S_RF_KILL_HW |
+           test_bit(S_GEO_CONFIGURED, &il->status) << S_GEO_CONFIGURED |
+           test_bit(S_FW_ERROR, &il->status) << S_FW_ERROR |
            test_bit(S_EXIT_PENDING, &il->status) << S_EXIT_PENDING;
 
        il4965_txq_ctx_stop(il);