From: Andrew Lunn Date: Sun, 20 Nov 2016 19:14:16 +0000 (+0100) Subject: net: dsa: mv88e6xxx: Mask g1 interrupts and free interrupt X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=3460a5770ce97d7caeb4b11766c7bb2d74d0d29c;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git net: dsa: mv88e6xxx: Mask g1 interrupts and free interrupt Fix the g1 interrupt free code such that is masks any further interrupts, and then releases the interrupt. Signed-off-by: Andrew Lunn Signed-off-by: David S. Miller --- diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c index b843052d32bd..8fcef7e0d3ba 100644 --- a/drivers/net/dsa/mv88e6xxx/chip.c +++ b/drivers/net/dsa/mv88e6xxx/chip.c @@ -413,6 +413,13 @@ static const struct irq_domain_ops mv88e6xxx_g1_irq_domain_ops = { static void mv88e6xxx_g1_irq_free(struct mv88e6xxx_chip *chip) { int irq, virq; + u16 mask; + + mv88e6xxx_g1_read(chip, GLOBAL_CONTROL, &mask); + mask |= GENMASK(chip->g1_irq.nirqs, 0); + mv88e6xxx_g1_write(chip, GLOBAL_CONTROL, mask); + + free_irq(chip->irq, chip); for (irq = 0; irq < 16; irq++) { virq = irq_find_mapping(chip->g1_irq.domain, irq);