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

Commit 7d9f3e85 authored by Pavel Roskin's avatar Pavel Roskin Committed by John W. Linville
Browse files

[PATCH] bcm43xx: Fix assertion failures in interrupt handler 



In the bcm43xx interrupt handler, sanity checks are wrongly done before the
verification that the interrupt is for the bcm43xx.

Signed-off-by: default avatarPavel Roskin <proski@gnu.org>
Signed-off-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent d632f9fa

drivers/net/wireless/bcm43xx/bcm43xx_main.c

+3 −3
Original line number Diff line number Diff line
@@ -1858,9 +1858,6 @@ static irqreturn_t bcm43xx_interrupt_handler(int irq, void *dev_id) 


	spin_lock(&bcm->irq_lock);



	assert(bcm43xx_status(bcm) == BCM43xx_STAT_INITIALIZED);

	assert(bcm->current_core->id == BCM43xx_COREID_80211);



	reason = bcm43xx_read32(bcm, BCM43xx_MMIO_GEN_IRQ_REASON);

	if (reason == 0xffffffff) {

		/* irq not for us (shared irq) */
@@ -1871,6 +1868,9 @@ static irqreturn_t bcm43xx_interrupt_handler(int irq, void *dev_id) 
	if (!reason)

		goto out;



	assert(bcm43xx_status(bcm) == BCM43xx_STAT_INITIALIZED);

	assert(bcm->current_core->id == BCM43xx_COREID_80211);



	bcm->dma_reason[0] = bcm43xx_read32(bcm, BCM43xx_MMIO_DMA0_REASON)

			     & 0x0001DC00;

	bcm->dma_reason[1] = bcm43xx_read32(bcm, BCM43xx_MMIO_DMA1_REASON)