Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cb4da1a3 authored by Oliver Neukum's avatar Oliver Neukum Committed by David S. Miller
Browse files

[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: default avatarOliver Neukum <oneukum@suse.de>
Acked-by: default avatarZhu Yi <yi.zhu@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 23aeeec3

drivers/net/wireless/iwlwifi/iwl3945-base.c

+2 −1
Original line number Diff line number Diff line
@@ -4850,7 +4850,7 @@ static irqreturn_t iwl_isr(int irq, void *data) 
	if ((inta == 0xFFFFFFFF) || ((inta & 0xFFFFFFF0) == 0xa5a5a5a0)) {

		/* Hardware disappeared */

		IWL_WARNING("HARDWARE GONE?? INTA == 0x%080x\n", inta);

		goto none;

		goto unplugged;

	}



	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) 


	/* iwl_irq_tasklet() will service interrupts and re-enable them */

	tasklet_schedule(&priv->irq_tasklet);

unplugged:

	spin_unlock(&priv->lock);



	return IRQ_HANDLED;