Re: [PATCH] stmmac: Remove unbalanced clk_disable call

[Giuseppe CAVALLARO <peppe.cavallaro@st.com>]

On 5/20/2014 11:38 AM, Hans de Goede wrote:
> The stmmac_open call was calling clk_disable_unprepare on phy init
> failure, but it never calls clk_prepare_enable, this causes
> a WARN_ON in the clk framework to trigger if for some reason phy init
> fails.
>
> Signed-off-by: Hans de Goede <hdegoede@redhat.com>

Acked-by: Giuseppe Cavallaro <peppe.cavallaro@st.com>

> ---
>   drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 4 +---
>   1 file changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
> index d940034..0f4841d 100644
> --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
> +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
> @@ -1704,7 +1704,7 @@ static int stmmac_open(struct net_device *dev)
>   		if (ret) {
>   			pr_err("%s: Cannot attach to PHY (error: %d)\n",
>   			       __func__, ret);
> -			goto phy_error;
> +			return ret;
>   		}
>   	}
>
> @@ -1779,8 +1779,6 @@ init_error:
>   dma_desc_error:
>   	if (priv->phydev)
>   		phy_disconnect(priv->phydev);
> -phy_error:
> -	clk_disable_unprepare(priv->stmmac_clk);
>
>   	return ret;
>   }
>