* [PATCH net] net: bcmgenet: fix error returns in bcmgenet_probe()
@ 2020-07-20 7:18 Zhang Changzhong
2020-07-20 16:04 ` Doug Berger
2020-07-20 17:02 ` Florian Fainelli
0 siblings, 2 replies; 4+ messages in thread
From: Zhang Changzhong @ 2020-07-20 7:18 UTC (permalink / raw)
To: opendmb, f.fainelli, davem, kuba
Cc: bcm-kernel-feedback-list, netdev, linux-kernel
The driver forgets to call clk_disable_unprepare() in error path after
a success calling for clk_prepare_enable().
Fix to goto err_clk_disable if clk_prepare_enable() is successful.
Fixes: 99d55638d4b0 ("net: bcmgenet: enable NETIF_F_HIGHDMA flag")
Signed-off-by: Zhang Changzhong <zhangchangzhong@huawei.com>
---
drivers/net/ethernet/broadcom/genet/bcmgenet.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
index 368e05b..903811e 100644
--- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c
+++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
@@ -3988,7 +3988,7 @@ static int bcmgenet_probe(struct platform_device *pdev)
if (err)
err = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));
if (err)
- goto err;
+ goto err_clk_disable;
/* Mii wait queue */
init_waitqueue_head(&priv->wq);
--
1.8.3.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH net] net: bcmgenet: fix error returns in bcmgenet_probe()
2020-07-20 7:18 [PATCH net] net: bcmgenet: fix error returns in bcmgenet_probe() Zhang Changzhong
@ 2020-07-20 16:04 ` Doug Berger
2020-07-20 17:02 ` Florian Fainelli
1 sibling, 0 replies; 4+ messages in thread
From: Doug Berger @ 2020-07-20 16:04 UTC (permalink / raw)
To: Zhang Changzhong, f.fainelli, davem, kuba
Cc: bcm-kernel-feedback-list, netdev, linux-kernel
On 7/20/2020 12:18 AM, Zhang Changzhong wrote:
> The driver forgets to call clk_disable_unprepare() in error path after
> a success calling for clk_prepare_enable().
>
> Fix to goto err_clk_disable if clk_prepare_enable() is successful.
>
> Fixes: 99d55638d4b0 ("net: bcmgenet: enable NETIF_F_HIGHDMA flag")
> Signed-off-by: Zhang Changzhong <zhangchangzhong@huawei.com>
> ---
> drivers/net/ethernet/broadcom/genet/bcmgenet.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
> index 368e05b..903811e 100644
> --- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c
> +++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
> @@ -3988,7 +3988,7 @@ static int bcmgenet_probe(struct platform_device *pdev)
> if (err)
> err = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));
> if (err)
> - goto err;
> + goto err_clk_disable;
>
> /* Mii wait queue */
> init_waitqueue_head(&priv->wq);
>
Acked-by: Doug Berger <opendmb@gmail.com>
Thanks!
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH net] net: bcmgenet: fix error returns in bcmgenet_probe()
2020-07-20 7:18 [PATCH net] net: bcmgenet: fix error returns in bcmgenet_probe() Zhang Changzhong
2020-07-20 16:04 ` Doug Berger
@ 2020-07-20 17:02 ` Florian Fainelli
1 sibling, 0 replies; 4+ messages in thread
From: Florian Fainelli @ 2020-07-20 17:02 UTC (permalink / raw)
To: Zhang Changzhong, opendmb, davem, kuba
Cc: bcm-kernel-feedback-list, netdev, linux-kernel
On 7/20/20 12:18 AM, Zhang Changzhong wrote:
> The driver forgets to call clk_disable_unprepare() in error path after
> a success calling for clk_prepare_enable().
>
> Fix to goto err_clk_disable if clk_prepare_enable() is successful.
>
> Fixes: 99d55638d4b0 ("net: bcmgenet: enable NETIF_F_HIGHDMA flag")
> Signed-off-by: Zhang Changzhong <zhangchangzhong@huawei.com>
Acked-by: Florian fainelli <f.fainelli@gmail.com>
--
Florian
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH net] net: bcmgenet: fix error returns in bcmgenet_probe()
@ 2020-07-20 7:28 Zhang Changzhong
0 siblings, 0 replies; 4+ messages in thread
From: Zhang Changzhong @ 2020-07-20 7:28 UTC (permalink / raw)
To: opendmb, f.fainelli, davem, kuba
Cc: bcm-kernel-feedback-list, netdev, linux-kernel
The driver forgets to call clk_disable_unprepare() in error path after
a success calling for clk_prepare_enable().
Fix to goto err_clk_disable if clk_prepare_enable() is successful.
Fixes: c80d36ff63a5 ("net: bcmgenet: Use devm_clk_get_optional() to get the clocks")
Signed-off-by: Zhang Changzhong <zhangchangzhong@huawei.com>
---
drivers/net/ethernet/broadcom/genet/bcmgenet.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
index 368e05b..79d27be 100644
--- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c
+++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
@@ -4000,14 +4000,14 @@ static int bcmgenet_probe(struct platform_device *pdev)
if (IS_ERR(priv->clk_wol)) {
dev_dbg(&priv->pdev->dev, "failed to get enet-wol clock\n");
err = PTR_ERR(priv->clk_wol);
- goto err;
+ goto err_clk_disable;
}
priv->clk_eee = devm_clk_get_optional(&priv->pdev->dev, "enet-eee");
if (IS_ERR(priv->clk_eee)) {
dev_dbg(&priv->pdev->dev, "failed to get enet-eee clock\n");
err = PTR_ERR(priv->clk_eee);
- goto err;
+ goto err_clk_disable;
}
/* If this is an internal GPHY, power it on now, before UniMAC is
--
1.8.3.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-07-20 17:02 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-07-20 7:18 [PATCH net] net: bcmgenet: fix error returns in bcmgenet_probe() Zhang Changzhong
2020-07-20 16:04 ` Doug Berger
2020-07-20 17:02 ` Florian Fainelli
2020-07-20 7:28 Zhang Changzhong
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.