diff options
| author | Mohamed Abbas <mohamed.abbas@intel.com> | 2009-06-03 11:44:10 -0700 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2009-06-04 10:58:11 -0400 |
| commit | 258c44a0c02a7ffbb9555747008d6bf9a3ea58a0 (patch) | |
| tree | a3d7585c5e99547d4322c4ac4385193c41c4be1d /drivers | |
| parent | ee5006a19c9e040d715efb75a6f4fa78764869ce (diff) | |
| download | op-kernel-dev-258c44a0c02a7ffbb9555747008d6bf9a3ea58a0.zip op-kernel-dev-258c44a0c02a7ffbb9555747008d6bf9a3ea58a0.tar.gz | |
iwlagn: delay ict interrupt.
Wait until ucode is loaded and driver receive ALIVE_REPLY then switch
to ICT interrupt. This ensures we receive all interrupts indicating
successful ucode load.
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')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c index e6ecb3f..b77208d 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn.c @@ -1887,8 +1887,6 @@ static int __iwl_up(struct iwl_priv *priv) /* clear (again), then enable host interrupts */ iwl_write32(priv, CSR_INT, 0xFFFFFFFF); - /* enable dram interrupt */ - iwl_reset_ict(priv); iwl_enable_interrupts(priv); /* really make sure rfkill handshake bits are cleared */ @@ -1962,6 +1960,9 @@ static void iwl_bg_alive_start(struct work_struct *data) if (test_bit(STATUS_EXIT_PENDING, &priv->status)) return; + /* enable dram interrupt */ + iwl_reset_ict(priv); + mutex_lock(&priv->mutex); iwl_alive_start(priv); mutex_unlock(&priv->mutex); |
