diff options
| author | Mark Brown <broonie@kernel.org> | 2014-10-20 12:55:07 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-10-20 13:27:32 -0400 |
| commit | b7a40242c82cd73cfcea305f23e67d068dd8401a (patch) | |
| tree | 251b49d19cd7c371847ae1f951e1b537ca0e1c15 /drivers/net/wireless/ath/ath9k/main.c | |
| parent | d26833bfce5e56017bea9f1f50838f20e18e7b7e (diff) | |
| parent | 9c6de47d53a3ce8df1642ae67823688eb98a190a (diff) | |
Merge branch 'fix/dw' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi into spi-dw
Conflicts:
drivers/spi/spi-dw-mid.c
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 e6ac8d2e610c..4b148bbb2bf6 100644 --- a/drivers/net/wireless/ath/ath9k/main.c +++ b/drivers/net/wireless/ath/ath9k/main.c | |||
| @@ -513,7 +513,7 @@ irqreturn_t ath_isr(int irq, void *dev) | |||
| 513 | * touch anything. Note this can happen early | 513 | * touch anything. Note this can happen early |
| 514 | * on if the IRQ is shared. | 514 | * on if the IRQ is shared. |
| 515 | */ | 515 | */ |
| 516 | if (test_bit(ATH_OP_INVALID, &common->op_flags)) | 516 | if (!ah || test_bit(ATH_OP_INVALID, &common->op_flags)) |
| 517 | return IRQ_NONE; | 517 | return IRQ_NONE; |
| 518 | 518 | ||
| 519 | /* shared irq, not for us */ | 519 | /* shared irq, not for us */ |