diff options
| author | David S. Miller <davem@davemloft.net> | 2012-01-28 02:40:18 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-01-28 02:40:18 +0100 |
| commit | cc0d7b91db000aef1cc12f1d3d4d7f80af9bd419 (patch) | |
| tree | 5f0e86afb61b33658ec42b37ae739809ec98cb3d /drivers/net | |
| parent | net: explicitly add jump_label.h header to sock.h (diff) | |
| parent | iwlwifi: fix PCI-E transport "inta" race (diff) | |
| download | linux-cc0d7b91db000aef1cc12f1d3d4d7f80af9bd419.tar.xz linux-cc0d7b91db000aef1cc12f1d3d4d7f80af9bd419.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c b/drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c index 752493f00406..65d1f05007be 100644 --- a/drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c +++ b/drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c @@ -972,11 +972,11 @@ void iwl_irq_tasklet(struct iwl_trans *trans) } #endif - spin_unlock_irqrestore(&trans->shrd->lock, flags); - /* saved interrupt in inta variable now we can reset trans_pcie->inta */ trans_pcie->inta = 0; + spin_unlock_irqrestore(&trans->shrd->lock, flags); + /* Now service all interrupt bits discovered above. */ if (inta & CSR_INT_BIT_HW_ERR) { IWL_ERR(trans, "Hardware error detected. Restarting.\n"); |