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

Commit cbbc0138 authored by Rafał Miłecki's avatar Rafał Miłecki Committed by John W. Linville
Browse files

bcma: mips: fix clearing device IRQ 



We were using wrong IRQ number so clearing wasn't working at all.
Depending on a platform this could result in a one device having two
interrupts assigned. On BCM4706 this resulted in all IRQs being broken.

Cc: Hauke Mehrtens <hauke@hauke-m.de>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarRafał Miłecki <zajec5@gmail.com>
Acked-by: default avatarHauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 3edfd10b

drivers/bcma/driver_mips.c

+1 −1
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ static void bcma_core_mips_set_irq(struct bcma_device *dev, unsigned int irq) 
			    bcma_read32(mdev, BCMA_MIPS_MIPS74K_INTMASK(0)) &

			    ~(1 << irqflag));

	else

		bcma_write32(mdev, BCMA_MIPS_MIPS74K_INTMASK(irq), 0);

		bcma_write32(mdev, BCMA_MIPS_MIPS74K_INTMASK(oldirq), 0);



	/* assign the new one */

	if (irq == 0) {