diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2012-12-27 21:37:04 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-17 08:46:36 -0800 |
| commit | 1c543013adbf1a59c4f416f08475458444c2331a (patch) | |
| tree | 93c70d3af36e961f3ac73fc3cfe45f8018366c81 /drivers | |
| parent | edb6cae74b8c083d8264517eab0cb354c01c49ee (diff) | |
iwlwifi: fix PCIe interrupt handle return value
commit 392d4cad7907f6cb4ffc85e135a01abfddc89027 upstream.
By accident, commit eb6476441bc2fecf6232a87d0313a85f8e3da7f4
("iwlwifi: protect use_ict with irq_lock") changed the return
value of the iwl_pcie_isr() function in case it handles an
interrupt -- it now returns IRQ_NONE instead of IRQ_HANDLED.
Put back the correct return value.
Reviewed-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/pcie/rx.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/pcie/rx.c b/drivers/net/wireless/iwlwifi/pcie/rx.c index 25146cee8cba..3654de23c573 100644 --- a/drivers/net/wireless/iwlwifi/pcie/rx.c +++ b/drivers/net/wireless/iwlwifi/pcie/rx.c @@ -971,6 +971,7 @@ static irqreturn_t iwl_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. */ |