[PATCH] net: mv643xx_eth: undo some opreations in mv643xx_eth_probe

Subsystems: marvell mv643xx ethernet driver, networking drivers, the rest

STALE1636d

2 messages, 2 authors, 2022-03-15 · open the first message on its own page

[PATCH] net: mv643xx_eth: undo some opreations in mv643xx_eth_probe

From: <hidden>
Date: 2022-03-15 02:30:30 

From: Minghao Chi <redacted>

Cannot directly return platform_get_irq return irq, there
are operations that need to be undone.

Reported-by: Zeal Robot <redacted>
Signed-off-by: Minghao Chi <redacted>
---
 drivers/net/ethernet/marvell/mv643xx_eth.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/marvell/mv643xx_eth.c b/drivers/net/ethernet/marvell/mv643xx_eth.c
index e6cd4e214d79..6cd81737786e 100644
--- a/drivers/net/ethernet/marvell/mv643xx_eth.c
+++ b/drivers/net/ethernet/marvell/mv643xx_eth.c
@@ -3189,8 +3189,11 @@ static int mv643xx_eth_probe(struct platform_device *pdev)
 
 
 	irq = platform_get_irq(pdev, 0);
-	if (WARN_ON(irq < 0))
+	if (WARN_ON(irq < 0)) {
+		clk_disable_unprepare(mp->clk);
+		free_netdev(dev);
 		return irq;
+	}
 	dev->irq = irq;
 
 	dev->netdev_ops = &mv643xx_eth_netdev_ops;
-- 
2.25.1

Re: [PATCH] net: mv643xx_eth: undo some opreations in mv643xx_eth_probe

From: Andrew Lunn <andrew@lunn.ch>
Date: 2022-03-15 20:26:45 

On Tue, Mar 15, 2022 at 02:30:19AM +0000, cgel.zte@gmail.com wrote:
quoted hunk
From: Minghao Chi <redacted>

Cannot directly return platform_get_irq return irq, there
are operations that need to be undone.

Reported-by: Zeal Robot <redacted>
Signed-off-by: Minghao Chi <redacted>
---
 drivers/net/ethernet/marvell/mv643xx_eth.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/marvell/mv643xx_eth.c b/drivers/net/ethernet/marvell/mv643xx_eth.c
index e6cd4e214d79..6cd81737786e 100644
--- a/drivers/net/ethernet/marvell/mv643xx_eth.c
+++ b/drivers/net/ethernet/marvell/mv643xx_eth.c
@@ -3189,8 +3189,11 @@ static int mv643xx_eth_probe(struct platform_device *pdev)
 
 
 	irq = platform_get_irq(pdev, 0);
-	if (WARN_ON(irq < 0))
+	if (WARN_ON(irq < 0)) {
+		clk_disable_unprepare(mp->clk);
+		free_netdev(dev);
 		return irq;
+	}
Isn't this where i said you should:

	goto out;

You need to set err first.

	Andrew
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help