[PATCH v5] net: ethernet: ti: am65-cpts: update ret when ptp_clock is ERROR

[PATCH v5] net: ethernet: ti: am65-cpts: update ret when ptp_clock is ERROR

[Grygorii Strashko]

From: Wang Qing <wangqing@vivo.com>

We always have to update the value of ret, otherwise the
 error value may be the previous one.

Fixes: f6bd59526ca5 ("net: ethernet: ti: introduce am654 common platform time sync driver")
Signed-off-by: Wang Qing <wangqing@vivo.com>
[grygorii.strashko@ti.com: fix build warn, subj add fixes tag]
Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>
Acked-by: Richard Cochran <richardcochran@gmail.com>
---
Hi

I've update patch as requested and added Acked-by from Richard from v1.

v4: https://lore.kernel.org/patchwork/patch/1336771/
v3: https://lore.kernel.org/patchwork/patch/1334871/
v2: https://lore.kernel.org/patchwork/patch/1334549/
v1: https://lore.kernel.org/patchwork/patch/1334067/

 drivers/net/ethernet/ti/am65-cpts.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/net/ethernet/ti/am65-cpts.c b/drivers/net/ethernet/ti/am65-cpts.c
index 75056c14b161..5dc60ecabe56 100644
--- a/drivers/net/ethernet/ti/am65-cpts.c
+++ b/drivers/net/ethernet/ti/am65-cpts.c
@@ -1001,8 +1001,7 @@ struct am65_cpts *am65_cpts_create(struct device *dev, void __iomem *regs,
 	if (IS_ERR_OR_NULL(cpts->ptp_clock)) {
 		dev_err(dev, "Failed to register ptp clk %ld\n",
 			PTR_ERR(cpts->ptp_clock));
-		if (!cpts->ptp_clock)
-			ret = -ENODEV;
+		ret = cpts->ptp_clock ? PTR_ERR(cpts->ptp_clock) : -ENODEV;
 		goto refclk_disable;
 	}
 	cpts->phc_index = ptp_clock_index(cpts->ptp_clock);
-- 
2.17.1

Re: [PATCH v5] net: ethernet: ti: am65-cpts: update ret when ptp_clock is ERROR

[Jakub Kicinski]

On Thu, 12 Nov 2020 18:45:41 +0200 Grygorii Strashko wrote:
> From: Wang Qing <wangqing@vivo.com>
> 
> We always have to update the value of ret, otherwise the
>  error value may be the previous one.
> 
> Fixes: f6bd59526ca5 ("net: ethernet: ti: introduce am654 common platform time sync driver")
> Signed-off-by: Wang Qing <wangqing@vivo.com>
> [grygorii.strashko@ti.com: fix build warn, subj add fixes tag]
> Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>
> Acked-by: Richard Cochran <richardcochran@gmail.com>

Thanks for handling this, applied!