diff mbox

[-next] net: ethernet: nb8800: fix error handling of nb8800_probe()

Message ID 1468927990-3041-1-git-send-email-weiyj_lk@163.com
State Accepted, archived
Delegated to: David Miller
Headers show

Commit Message

weiyj_lk@163.com July 19, 2016, 11:33 a.m. UTC
From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>

In ops->reset() error handling case, clk_disable_unprepare() is missed
before return from this function.

Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
---
 drivers/net/ethernet/aurora/nb8800.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Måns Rullgård July 19, 2016, 11:37 a.m. UTC | #1
Wei Yongjun <weiyj_lk@163.com> writes:

> From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
>
> In ops->reset() error handling case, clk_disable_unprepare() is missed
> before return from this function.
>
> Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>

Acked-by: Mans Rullgard <mans@mansr.com>

> ---
>  drivers/net/ethernet/aurora/nb8800.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/net/ethernet/aurora/nb8800.c b/drivers/net/ethernet/aurora/nb8800.c
> index 2dcb8c7..0d4ea92 100644
> --- a/drivers/net/ethernet/aurora/nb8800.c
> +++ b/drivers/net/ethernet/aurora/nb8800.c
> @@ -1419,7 +1419,7 @@ static int nb8800_probe(struct platform_device *pdev)
>  	if (ops && ops->reset) {
>  		ret = ops->reset(dev);
>  		if (ret)
> -			goto err_free_dev;
> +			goto err_disable_clk;
>  	}
>
>  	bus = devm_mdiobus_alloc(&pdev->dev);
>
David Miller July 20, 2016, 9:48 p.m. UTC | #2
From: Wei Yongjun <weiyj_lk@163.com>
Date: Tue, 19 Jul 2016 11:33:10 +0000

> From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
> 
> In ops->reset() error handling case, clk_disable_unprepare() is missed
> before return from this function.
> 
> Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>

Applied.
diff mbox

Patch

diff --git a/drivers/net/ethernet/aurora/nb8800.c b/drivers/net/ethernet/aurora/nb8800.c
index 2dcb8c7..0d4ea92 100644
--- a/drivers/net/ethernet/aurora/nb8800.c
+++ b/drivers/net/ethernet/aurora/nb8800.c
@@ -1419,7 +1419,7 @@  static int nb8800_probe(struct platform_device *pdev)
 	if (ops && ops->reset) {
 		ret = ops->reset(dev);
 		if (ret)
-			goto err_free_dev;
+			goto err_disable_clk;
 	}
 
 	bus = devm_mdiobus_alloc(&pdev->dev);