| Message ID | 1595229523-9725-1-git-send-email-zhangchangzhong@huawei.com |
|---|---|
| State | Accepted |
| Delegated to: | David Miller |
| Headers | show |
| Series | [net] net: bcmgenet: fix error returns in bcmgenet_probe() | expand |
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!
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>
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);
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(-)