]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
net: dsa: mxl862xx: cancel pending work on probe error
authorDaniel Golle <daniel@makrotopia.org>
Mon, 30 Mar 2026 22:52:09 +0000 (23:52 +0100)
committerJakub Kicinski <kuba@kernel.org>
Wed, 1 Apr 2026 02:16:31 +0000 (19:16 -0700)
Call mxl862xx_host_shutdown() in case dsa_register_switch() returns
an error, so any still pending crc_err_work get canceled.

Fixes: a319d0c8c8ce ("net: dsa: mxl862xx: add CRC for MDIO communication")
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Link: https://patch.msgid.link/3fd163f5bb88de426ca9847549f94b4296170ef0.1774911025.git.daniel@makrotopia.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/dsa/mxl862xx/mxl862xx.c

index 78eef639628a07386c341758dabad74fb612780f..af9b00b2d2c4354fbbc5efc67088bb005742191f 100644 (file)
@@ -407,6 +407,7 @@ static int mxl862xx_probe(struct mdio_device *mdiodev)
        struct device *dev = &mdiodev->dev;
        struct mxl862xx_priv *priv;
        struct dsa_switch *ds;
+       int err;
 
        priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
        if (!priv)
@@ -428,7 +429,11 @@ static int mxl862xx_probe(struct mdio_device *mdiodev)
 
        dev_set_drvdata(dev, ds);
 
-       return dsa_register_switch(ds);
+       err = dsa_register_switch(ds);
+       if (err)
+               mxl862xx_host_shutdown(priv);
+
+       return err;
 }
 
 static void mxl862xx_remove(struct mdio_device *mdiodev)