net: ravb: Check return value of reset_control_deassert()

[ Upstream commit d8eb6ea4b302e7ff78535c205510e359ac10a0bd ]

reset_control_deassert() could return an error. Some devices cannot work
if reset signal de-assert operation fails. To avoid this check the return
code of reset_control_deassert() in ravb_probe() and take proper action.

Along with it, the free_netdev() call from the error path was moved after
reset_control_assert() on its own label (out_free_netdev) to free
netdev in case reset_control_deassert() fails.

Fixes: 0d13a1a464a0 ("ravb: Add reset support")
Reviewed-by: Sergey Shtylyov <s.shtylyov@omp.ru>
Reviewed-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Claudiu Beznea <claudiu.beznea.uj@bp.renesas.com>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/net/ethernet/renesas/ravb_main.c b/drivers/net/ethernet/renesas/ravb_main.c
index 020edbd0a44a60c0406d0fc2f2879391b7d95c87..2bcea9fdd265325f0a25614ef6d742218b49a5c7 100644 (file)
--- a/drivers/net/ethernet/renesas/ravb_main.c
+++ b/drivers/net/ethernet/renesas/ravb_main.c
@@ -2670,7 +2670,10 @@ static int ravb_probe(struct platform_device *pdev)
        ndev->features = info->net_features;
        ndev->hw_features = info->net_hw_features;
 
-       reset_control_deassert(rstc);
+       error = reset_control_deassert(rstc);
+       if (error)
+               goto out_free_netdev;
+
        pm_runtime_enable(&pdev->dev);
        pm_runtime_get_sync(&pdev->dev);
 
@@ -2897,11 +2900,11 @@ out_disable_gptp_clk:
 out_disable_refclk:
        clk_disable_unprepare(priv->refclk);
 out_release:
-       free_netdev(ndev);
-
        pm_runtime_put(&pdev->dev);
        pm_runtime_disable(&pdev->dev);
        reset_control_assert(rstc);
+out_free_netdev:
+       free_netdev(ndev);
        return error;
 }