diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-09-22 12:19:22 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-09-22 12:19:22 -0400 |
| commit | 1199992df2417dc9a1db1b19930ea4d0a697a61e (patch) | |
| tree | 4d0c187a1fe17e3f3745011c6fd2fa6c588e24d9 /drivers | |
| parent | abef3bd71029b80ec1bdd6c6244b5b0b99f56633 (diff) | |
| parent | a7be50b7e30f9d77cb059a7ffdb781bb0fb92eba (diff) | |
| download | linux-1199992df2417dc9a1db1b19930ea4d0a697a61e.tar.gz linux-1199992df2417dc9a1db1b19930ea4d0a697a61e.tar.bz2 linux-1199992df2417dc9a1db1b19930ea4d0a697a61e.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/pcie/trans.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/pcie/trans.c b/drivers/net/wireless/iwlwifi/pcie/trans.c index 1e86ea2266d4..dbeebef562d5 100644 --- a/drivers/net/wireless/iwlwifi/pcie/trans.c +++ b/drivers/net/wireless/iwlwifi/pcie/trans.c @@ -1442,6 +1442,7 @@ static int iwl_trans_pcie_start_hw(struct iwl_trans *trans) return err; err_free_irq: + trans_pcie->irq_requested = false; free_irq(trans_pcie->irq, trans); error: iwl_free_isr_ict(trans); |