projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'omap/multiplatform-fixes', tag 'v3.8-rc5' into next/multiplatform
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
net
/
wireless
/
iwlwifi
/
pcie
/
rx.c
diff --git
a/drivers/net/wireless/iwlwifi/pcie/rx.c
b/drivers/net/wireless/iwlwifi/pcie/rx.c
index dad4c4aad91f2a461cdebfc9ac879b51a36db827..8389cd38338ba70766561d13c35591e1073faca6 100644
(file)
--- a/
drivers/net/wireless/iwlwifi/pcie/rx.c
+++ b/
drivers/net/wireless/iwlwifi/pcie/rx.c
@@
-1166,6
+1166,7
@@
static irqreturn_t iwl_pcie_isr(int irq, void *data)
else if (test_bit(STATUS_INT_ENABLED, &trans_pcie->status) &&
!trans_pcie->inta)
iwl_enable_interrupts(trans);
+ return IRQ_HANDLED;
none:
/* re-enable interrupts here since we don't have anything to service. */