net: dsa: mv88e6xxx: fix freeing unused SERDES IRQ

Now mv88e6xxx does not enable its ports at setup itself and let
the DSA core handle this, unused ports are disabled without being
powered on first. While that is expected, the SERDES powering code
was assuming that a port was already set up before powering it down,
resulting in freeing an unused IRQ. The patch fixes this assumption.

Fixes: b759f528ca3d ("net: dsa: mv88e6xxx: enable SERDES after setup")
Signed-off-by: Vivien Didelot <vivien.didelot@gmail.com>
Reviewed-by: Marek Behún <marek.behun@nic.cz>
Tested-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 6525075f6bd32563fcbc0c65d6e22069891a2277..c648f9fbfa59d8c7758f8de1d1761431d3e23d06 100644 (file)
--- a/drivers/net/dsa/mv88e6xxx/chip.c
+++ b/drivers/net/dsa/mv88e6xxx/chip.c
@@ -2070,7 +2070,8 @@ static int mv88e6xxx_serdes_power(struct mv88e6xxx_chip *chip, int port,
                if (chip->info->ops->serdes_irq_setup)
                        err = chip->info->ops->serdes_irq_setup(chip, port);
        } else {
-               if (chip->info->ops->serdes_irq_free)
+               if (chip->info->ops->serdes_irq_free &&
+                   chip->ports[port].serdes_irq)
                        chip->info->ops->serdes_irq_free(chip, port);
 
                err = chip->info->ops->serdes_power(chip, port, false);