| Message ID | 1604649411-24886-1-git-send-email-wangqing@vivo.com |
|---|---|
| State | New |
| Headers | show |
| Series | net/ethernet: update ret when ptp_clock is ERROR | expand |
On 07/11/2020 17:08, Richard Cochran wrote: > On Fri, Nov 06, 2020 at 03:56:45PM +0800, Wang Qing wrote: >> We always have to update the value of ret, otherwise the >> error value may be the previous one. >> >> Signed-off-by: Wang Qing <wangqing@vivo.com> > > Acked-by: Richard Cochran <richardcochran@gmail.com> > Following Richard's comments: Reviewed-by: Grygorii Strashko <grygorii.strashko@ti.com> > >> --- >> 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 75056c1..b77ff61 >> --- 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 ? cpts->ptp_clock : (-ENODEV); >> goto refclk_disable; >> } >> cpts->phc_index = ptp_clock_index(cpts->ptp_clock); >> -- >> 2.7.4 >> -- Best regards, grygorii
diff --git a/drivers/net/ethernet/ti/am65-cpts.c b/drivers/net/ethernet/ti/am65-cpts.c index 75056c1..b77ff61 --- 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 ? cpts->ptp_clock : (-ENODEV); goto refclk_disable; } cpts->phc_index = ptp_clock_index(cpts->ptp_clock);
We always have to update the value of ret, otherwise the error value may be the previous one. Signed-off-by: Wang Qing <wangqing@vivo.com> --- drivers/net/ethernet/ti/am65-cpts.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)