[net-next] net: stmmac: fix missing unlock on error in stmmac_suspend()

Commit Message

Wei Yongjun March 16, 2021, 7:42 a.m. UTC

From: Wei Yongjun <[e-mail]>

Add the missing unlock before return from function
stmmac_suspend() in the error handling case.

Fixes: 5ec55823438e ("net: stmmac: add clocks management for gmac driver")
Reported-by: Hulk Robot <[e-mail]>
Signed-off-by: Wei Yongjun <[e-mail]>
---
 drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Comments

Edmundo Carmona Antoranz March 16, 2021, 1:55 p.m. UTC | #1

On Tue, Mar 16, 2021 at 7:50 AM Edmundo Carmona Antoranz
<[e-mail]> wrote:

> I think you can let it go and check ret after unlocking:
>
>                 /* Disable clock in case of PWM is off */
>                clk_disable_unprepare(priv->plat->clk_ptp_ref);
>                ret = pm_runtime_force_suspend(dev);
>        }
>        mutex_unlock(&priv->lock);
>        if (ret)
>                return ret;

Oh, I C. It would require ret to be set to 0 before starting to use
it, right? Maybe it's worth it?

>
>        priv->speed = SPEED_UNKNOWN;
>        return 0;
>

Patch

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index a10704d8e3c6..d50df998d3aa 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -5400,8 +5400,10 @@  int stmmac_suspend(struct device *dev)
 		/* Disable clock in case of PWM is off */
 		clk_disable_unprepare(priv->plat->clk_ptp_ref);
 		ret = pm_runtime_force_suspend(dev);
-		if (ret)
+		if (ret) {
+			mutex_unlock(&priv->lock);
 			return ret;
+		}
 	}
 	mutex_unlock(&priv->lock);