| From 03a19cbb91994212be72ce15ac3406fa9f8ba079 Mon Sep 17 00:00:00 2001 |
| From: Emmanuel Grumbach <emmanuel.grumbach@intel.com> |
| Date: Wed, 21 Oct 2015 19:55:32 +0300 |
| Subject: iwlwifi: pcie: fix (again) prepare card flow |
| |
| From: Emmanuel Grumbach <emmanuel.grumbach@intel.com> |
| |
| commit 03a19cbb91994212be72ce15ac3406fa9f8ba079 upstream. |
| |
| 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. |
| |
| Fixes: c9fdec9f3970 ("iwlwifi: pcie: fix prepare card flow") |
| Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/net/wireless/iwlwifi/pcie/trans.c | 10 ++-------- |
| 1 file changed, 2 insertions(+), 8 deletions(-) |
| |
| --- a/drivers/net/wireless/iwlwifi/pcie/trans.c |
| +++ b/drivers/net/wireless/iwlwifi/pcie/trans.c |
| @@ -592,10 +592,8 @@ static int iwl_pcie_prepare_card_hw(stru |
| |
| 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(stru |
| |
| 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; |
| } |
| |
