diff mbox series

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

Message ID 20201112164541.3223-1-grygorii.strashko@ti.com (mailing list archive)
State Accepted
Delegated to: Netdev Maintainers
Headers show
Series [v5] net: ethernet: ti: am65-cpts: update ret when ptp_clock is ERROR | expand

Checks

Context Check Description
netdev/cover_letter success Link
netdev/fixes_present success Link
netdev/patch_count success Link
netdev/tree_selection success Guessed tree name to be net-next
netdev/subject_prefix warning Target tree name not specified in the subject
netdev/source_inline success Was 0 now: 0
netdev/verify_signedoff success Link
netdev/module_param success Was 0 now: 0
netdev/build_32bit success Errors and warnings before: 0 this patch: 0
netdev/kdoc success Errors and warnings before: 2 this patch: 2
netdev/verify_fixes success Link
netdev/checkpatch success total: 0 errors, 0 warnings, 0 checks, 9 lines checked
netdev/build_allmodconfig_warn success Errors and warnings before: 0 this patch: 0
netdev/header_inline success Link
netdev/stable success Stable not CCed

Commit Message

Grygorii Strashko Nov. 12, 2020, 4:45 p.m. UTC 
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(-)

Comments

Jakub Kicinski Nov. 13, 2020, 11:28 p.m. UTC | #1 
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!
diff mbox series

Patch

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);