Daniel Golle
38b0a59207
Swap pending with accepted patches, rebase remaining pending patches on top of new upstream. Signed-off-by: Daniel Golle <daniel@makrotopia.org>
41 lines
1.4 KiB
Diff
41 lines
1.4 KiB
Diff
From e9abf1da0af3f787a03b249945e5ca726c1b8013 Mon Sep 17 00:00:00 2001
|
|
From: Daniel Golle <daniel@makrotopia.org>
|
|
Date: Mon, 30 Mar 2026 23:52:09 +0100
|
|
Subject: [PATCH] net: dsa: mxl862xx: cancel pending work on probe error
|
|
|
|
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 | 7 ++++++-
|
|
1 file changed, 6 insertions(+), 1 deletion(-)
|
|
|
|
--- a/drivers/net/dsa/mxl862xx/mxl862xx.c
|
|
+++ b/drivers/net/dsa/mxl862xx/mxl862xx.c
|
|
@@ -407,6 +407,7 @@ static int mxl862xx_probe(struct mdio_de
|
|
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_de
|
|
|
|
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)
|