[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <CAGb2v65BLk2zOQKvhsuNsdjkhRA6UduaVeozXWr2PyWb+SkYFA@mail.gmail.com>
Date: Tue, 20 May 2014 18:59:01 +0800
From: Chen-Yu Tsai <wens@...e.org>
To: Giuseppe CAVALLARO <peppe.cavallaro@...com>
Cc: Hans de Goede <hdegoede@...hat.com>,
netdev <netdev@...r.kernel.org>
Subject: Re: [PATCH] stmmac: Remove unbalanced clk_disable call
On Tue, May 20, 2014 at 6:08 PM, Giuseppe CAVALLARO
<peppe.cavallaro@...com> wrote:
> 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@...hat.com>
>
>
> Acked-by: Giuseppe Cavallaro <peppe.cavallaro@...com>
This looks like left-overs from
62866e9 net: stmmac: Enable stmmac main clock when probing hardware
Acked-by: Chen-Yu Tsai <wens@...e.org>
>> ---
>> 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;
>> }
>>
>
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists