net: dsa: mv88e6xxx: lock mutex when freeing IRQs

vivien · davem330 · commit b32ca44a88de · 2017-09-28T10:28:24.000-07:00
mv88e6xxx_g2_irq_free locks the registers mutex, but not mv88e6xxx_g1_irq_free, which results in a stack trace from assert_reg_lock when unloading the mv88e6xxx module. Fix this. Fixes: 3460a57 ("net: dsa: mv88e6xxx: Mask g1 interrupts and free interrupt") Signed-off-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com> Reviewed-by: Florian Fainelli <f.fainelli@gmail.com> 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
@@ -3951,7 +3951,9 @@ static void mv88e6xxx_remove(struct mdio_device *mdiodev)
 	if (chip->irq > 0) {
 		if (chip->info->g2_irqs > 0)
 			mv88e6xxx_g2_irq_free(chip);
+		mutex_lock(&chip->reg_lock);
 		mv88e6xxx_g1_irq_free(chip);
+		mutex_unlock(&chip->reg_lock);
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -3951,7 +3951,9 @@ static void mv88e6xxx_remove(struct mdio_device *mdiodev)`
`3951`	`3951`	`if (chip->irq > 0) {`
`3952`	`3952`	`if (chip->info->g2_irqs > 0)`
`3953`	`3953`	`mv88e6xxx_g2_irq_free(chip);`
	`3954`	`+ mutex_lock(&chip->reg_lock);`
`3954`	`3955`	`mv88e6xxx_g1_irq_free(chip);`
	`3956`	`+ mutex_unlock(&chip->reg_lock);`
`3955`	`3957`	`}`
`3956`	`3958`	`}`
`3957`	`3959`