diff options
| author | Abbas, Mohamed <mohamed.abbas@intel.com> | 2009-01-21 08:33:55 +0300 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2009-01-30 00:01:06 +0300 |
| commit | e9414b6b3f34dcc3683e66dffa4f5f167d49df51 (patch) | |
| tree | 857f8deb0ce8110fcf82930d41c4b11db1c4b9db /drivers/net/wireless/iwlwifi/iwl-io.h | |
| parent | c0af96a6e63ef93c605ce495fff79c692d4b8c4d (diff) | |
| download | linux-e9414b6b3f34dcc3683e66dffa4f5f167d49df51.tar.xz | |
iwl3945: fix deep sleep when removing the driver.
A warning message "MAC is in deep sleep" sometimes happen when user removes
the driver. This warning is related to card not being ready. In __iwl3945_down
function some of the going down steps are in wrong order, to fix this this patch
do the following:
1- make sure we are calling iwl3945_apm_reset and iwl3945_apm_stop
in the right order.
2- make sure we set CSR_GP_CNTRL_REG_FLAG_INIT_DONE in apm_reset before
poll on CSR_GP_CNTRL_REG_FLAG_MAC_CLOCK_READY.
3- set correct polling counter.
This fixes bug
http://www.intellinuxwireless.org/bugzilla/show_bug.cgi?id=1834
Signed-off-by: mohamed abbas <mohamed.abbas@intel.com>
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-io.h')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-io.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-io.h b/drivers/net/wireless/iwlwifi/iwl-io.h index bc3f3daef6ed..7341a2da8431 100644 --- a/drivers/net/wireless/iwlwifi/iwl-io.h +++ b/drivers/net/wireless/iwlwifi/iwl-io.h @@ -165,7 +165,7 @@ static inline int _iwl_grab_nic_access(struct iwl_priv *priv) ret = _iwl_poll_bit(priv, CSR_GP_CNTRL, CSR_GP_CNTRL_REG_VAL_MAC_ACCESS_EN, (CSR_GP_CNTRL_REG_FLAG_MAC_CLOCK_READY | - CSR_GP_CNTRL_REG_FLAG_GOING_TO_SLEEP), 50); + CSR_GP_CNTRL_REG_FLAG_GOING_TO_SLEEP), 15000); if (ret < 0) { IWL_ERR(priv, "MAC is in deep sleep!\n"); return -EIO; |