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

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

Posted by cgel.zte@gmail.com 4 years, 3 months ago

From: Minghao Chi <chi.minghao@zte.com.cn>

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

Reported-by: Zeal Robot <zealci@zte.com.cn>
Signed-off-by: Minghao Chi <chi.minghao@zte.com.cn>
---
v1->v2:
  - Use goto out;
 drivers/net/ethernet/marvell/mv643xx_eth.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ethernet/marvell/mv643xx_eth.c b/drivers/net/ethernet/marvell/mv643xx_eth.c
index e6cd4e214d79..5f9ab1842d49 100644
--- a/drivers/net/ethernet/marvell/mv643xx_eth.c
+++ b/drivers/net/ethernet/marvell/mv643xx_eth.c
@@ -3189,8 +3189,10 @@ static int mv643xx_eth_probe(struct platform_device *pdev)
 
 
 	irq = platform_get_irq(pdev, 0);
-	if (WARN_ON(irq < 0))
-		return irq;
+	if (WARN_ON(irq < 0)) {
+		err = irq;
+		goto out;
+	}
 	dev->irq = irq;
 
 	dev->netdev_ops = &mv643xx_eth_netdev_ops;
-- 
2.25.1

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

Posted by Andrew Lunn 4 years, 3 months ago

On Wed, Mar 16, 2022 at 01:24:44AM +0000, cgel.zte@gmail.com wrote:
> From: Minghao Chi <chi.minghao@zte.com.cn>
> 
> Cannot directly return platform_get_irq return irq, there
> are operations that need to be undone.
> 
> Reported-by: Zeal Robot <zealci@zte.com.cn>
> Signed-off-by: Minghao Chi <chi.minghao@zte.com.cn>

Reviewed-by: Andrew Lunn <andrew@lunn.ch>

    Andrew

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

Posted by Jakub Kicinski 4 years, 3 months ago

On Wed, 16 Mar 2022 01:24:44 +0000 cgel.zte@gmail.com wrote:
> From: Minghao Chi <chi.minghao@zte.com.cn>
> 
> Cannot directly return platform_get_irq return irq, there
> are operations that need to be undone.
> 
> Reported-by: Zeal Robot <zealci@zte.com.cn>

Pretty sure I reported this :/ Fixes tag would be nice as well.
Let me fix those two issues and apply. 
Inhale, exhale.

> Signed-off-by: Minghao Chi <chi.minghao@zte.com.cn>

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

Posted by patchwork-bot+netdevbpf@kernel.org 4 years, 3 months ago

Hello:

This patch was applied to netdev/net-next.git (master)
by Jakub Kicinski <kuba@kernel.org>:

On Wed, 16 Mar 2022 01:24:44 +0000 you wrote:
> From: Minghao Chi <chi.minghao@zte.com.cn>
> 
> Cannot directly return platform_get_irq return irq, there
> are operations that need to be undone.
> 
> Reported-by: Zeal Robot <zealci@zte.com.cn>
> Signed-off-by: Minghao Chi <chi.minghao@zte.com.cn>
> 
> [...]

Here is the summary with links:
  - [V2] net: mv643xx_eth: undo some opreations in mv643xx_eth_probe
    https://git.kernel.org/netdev/net-next/c/571703ff387c

You are awesome, thank you!
-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html