iwlwifi: pcie: fix (again) prepare card flow
authorEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Wed, 21 Oct 2015 16:55:32 +0000 (19:55 +0300)
committerEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Sun, 25 Oct 2015 11:45:01 +0000 (13:45 +0200)
The hardware bug in the commit mentioned below forces us
not to re-enable the clock gating in the Host Cluster.
The impact on the power consumption is minimal and it allows
the WAKE_ME interrupt to propagate.

CC: <stable@vger.kernel.org> [4.1+]
Fixes: c9fdec9f3970 ("iwlwifi: pcie: fix prepare card flow")
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
drivers/net/wireless/iwlwifi/pcie/trans.c

index 6ba7d300b08f35e1ce05fdf8b3fcab058819f150..90283453073c1684b4332445e0028b65482af179 100644 (file)
@@ -592,10 +592,8 @@ static int iwl_pcie_prepare_card_hw(struct iwl_trans *trans)
 
                do {
                        ret = iwl_pcie_set_hw_ready(trans);
-                       if (ret >= 0) {
-                               ret = 0;
-                               goto out;
-                       }
+                       if (ret >= 0)
+                               return 0;
 
                        usleep_range(200, 1000);
                        t += 200;
@@ -605,10 +603,6 @@ static int iwl_pcie_prepare_card_hw(struct iwl_trans *trans)
 
        IWL_ERR(trans, "Couldn't prepare the card\n");
 
-out:
-       iwl_clear_bit(trans, CSR_DBG_LINK_PWR_MGMT_REG,
-                     CSR_RESET_LINK_PWR_MGMT_DISABLED);
-
        return ret;
 }