]> git.openfabrics.org - ~emulex/infiniband.git/commitdiff
iwlwifi: remove duplicate initialization in __iwl_down()
authorDan Carpenter <error27@gmail.com>
Tue, 15 Mar 2011 07:03:24 +0000 (10:03 +0300)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 30 Mar 2011 18:15:11 +0000 (14:15 -0400)
We initialize exit_pending twice.  It's the second initialization which
is correct.  That was added in d745d472af "iwlwifi: cancel scan when
down the device".

Signed-off-by: Dan Carpenter <error27@gmail.com>
Acked-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/iwlwifi/iwl-agn.c

index 321b18b591356b36899fef26e267c6ce25400d39..7adc60ea03cbbb04a7ca1426d8644a33bda53245 100644 (file)
@@ -2537,7 +2537,7 @@ static void iwl_cancel_deferred_work(struct iwl_priv *priv);
 static void __iwl_down(struct iwl_priv *priv)
 {
        unsigned long flags;
-       int exit_pending = test_bit(STATUS_EXIT_PENDING, &priv->status);
+       int exit_pending;
 
        IWL_DEBUG_INFO(priv, DRV_NAME " is going down\n");