diff options
| author | John W. Linville <linville@tuxdriver.com> | 2014-10-07 14:48:29 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-10-07 14:48:29 -0400 |
| commit | d7ffd588f00ef2d9d0f3acc569ddbaebe5c4f8c3 (patch) | |
| tree | 76c1fe931f6b1e6e9f29d25d887791f00d6b6ed7 /drivers/net/wireless/ath/ath9k/main.c | |
| parent | 3f08e47291879fb047d7d4464d2beaedfea4eb63 (diff) | |
| parent | f8adaf0ae978252c9f7e29e96aefcd8fcaf806ba (diff) | |
| download | linux-d7ffd588f00ef2d9d0f3acc569ddbaebe5c4f8c3.tar.gz linux-d7ffd588f00ef2d9d0f3acc569ddbaebe5c4f8c3.tar.bz2 linux-d7ffd588f00ef2d9d0f3acc569ddbaebe5c4f8c3.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/main.c')
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c index 9618cb35922d..205162449b72 100644 --- a/drivers/net/wireless/ath/ath9k/main.c +++ b/drivers/net/wireless/ath/ath9k/main.c @@ -502,7 +502,7 @@ irqreturn_t ath_isr(int irq, void *dev) * touch anything. Note this can happen early * on if the IRQ is shared. */ - if (test_bit(ATH_OP_INVALID, &common->op_flags)) + if (!ah || test_bit(ATH_OP_INVALID, &common->op_flags)) return IRQ_NONE; /* shared irq, not for us */ |