diff options
author | Oliver Neukum <oneukum@suse.de> | 2007-11-14 00:10:32 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2007-11-14 00:10:32 -0500 |
commit | cb4da1a34de3840ce49dc7292a063e1ef7f127af (patch) | |
tree | 335e298be180895fa09e1368d7a4b37df6dc5898 /drivers/net/wireless/iwlwifi/iwl3945-base.c | |
parent | 23aeeec365dcf8bc87fae44c533e50d0bb4f23cc (diff) |
[IWLWIFI]: Not correctly dealing with hotunplug.
It makes no sense to enable interrupts if a device has been unplugged.
In addition if in doubt IRQ_HANDLED should be returned.
Signed-off-by: Oliver Neukum <oneukum@suse.de>
Acked-by: Zhu Yi <yi.zhu@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl3945-base.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl3945-base.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c index be7c9f42a340..ee752f1e21dd 100644 --- a/drivers/net/wireless/iwlwifi/iwl3945-base.c +++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c | |||
@@ -4850,7 +4850,7 @@ static irqreturn_t iwl_isr(int irq, void *data) | |||
4850 | if ((inta == 0xFFFFFFFF) || ((inta & 0xFFFFFFF0) == 0xa5a5a5a0)) { | 4850 | if ((inta == 0xFFFFFFFF) || ((inta & 0xFFFFFFF0) == 0xa5a5a5a0)) { |
4851 | /* Hardware disappeared */ | 4851 | /* Hardware disappeared */ |
4852 | IWL_WARNING("HARDWARE GONE?? INTA == 0x%080x\n", inta); | 4852 | IWL_WARNING("HARDWARE GONE?? INTA == 0x%080x\n", inta); |
4853 | goto none; | 4853 | goto unplugged; |
4854 | } | 4854 | } |
4855 | 4855 | ||
4856 | IWL_DEBUG_ISR("ISR inta 0x%08x, enabled 0x%08x, fh 0x%08x\n", | 4856 | IWL_DEBUG_ISR("ISR inta 0x%08x, enabled 0x%08x, fh 0x%08x\n", |
@@ -4858,6 +4858,7 @@ static irqreturn_t iwl_isr(int irq, void *data) | |||
4858 | 4858 | ||
4859 | /* iwl_irq_tasklet() will service interrupts and re-enable them */ | 4859 | /* iwl_irq_tasklet() will service interrupts and re-enable them */ |
4860 | tasklet_schedule(&priv->irq_tasklet); | 4860 | tasklet_schedule(&priv->irq_tasklet); |
4861 | unplugged: | ||
4861 | spin_unlock(&priv->lock); | 4862 | spin_unlock(&priv->lock); |
4862 | 4863 | ||
4863 | return IRQ_HANDLED; | 4864 | return IRQ_HANDLED; |