This is a note to let you know that I've just added the patch titled net: ethernet: ti: am65-cpts: update ret when ptp_clock is ERROR to the 5.9-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: net-ethernet-ti-am65-cpts-update-ret-when-ptp_clock-is-error.patch and it can be found in the queue-5.9 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@xxxxxxxxxxxxxxx> know about it. >From foo@baz Sun Nov 22 10:24:40 AM CET 2020 From: Wang Qing <wangqing@xxxxxxxx> Date: Thu, 12 Nov 2020 18:45:41 +0200 Subject: net: ethernet: ti: am65-cpts: update ret when ptp_clock is ERROR From: Wang Qing <wangqing@xxxxxxxx> [ Upstream commit 81e329e93b860b31c216b40eb5e1373db0ffe0ba ] 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@xxxxxxxx> [grygorii.strashko@xxxxxx: fix build warn, subj add fixes tag] Signed-off-by: Grygorii Strashko <grygorii.strashko@xxxxxx> Acked-by: Richard Cochran <richardcochran@xxxxxxxxx> Link: https://lore.kernel.org/r/20201112164541.3223-1-grygorii.strashko@xxxxxx Signed-off-by: Jakub Kicinski <kuba@xxxxxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- drivers/net/ethernet/ti/am65-cpts.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) --- a/drivers/net/ethernet/ti/am65-cpts.c +++ b/drivers/net/ethernet/ti/am65-cpts.c @@ -1016,8 +1016,7 @@ struct am65_cpts *am65_cpts_create(struc 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); Patches currently in stable-queue which might be from wangqing@xxxxxxxx are queue-5.9/net-ethernet-ti-am65-cpts-update-ret-when-ptp_clock-is-error.patch