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 <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c
index b843052d32bd6f7d1a8374ee4b60bfd2ce0a63a7..8fcef7e0d3ba1c37d3de8944ad206d1a831dab26 100644 (file)
--- 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);