From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dan Carpenter Subject: [patch] stmmac: fix an error code in stmmac_ptp_register() Date: Fri, 14 Oct 2016 22:26:11 +0300 Message-ID: <20161014192417.GC21917@mwanda> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: Alexandre Torgue , netdev@vger.kernel.org, kernel-janitors@vger.kernel.org To: Giuseppe Cavallaro Return-path: Received: from aserp1040.oracle.com ([141.146.126.69]:42731 "EHLO aserp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750929AbcJNT00 (ORCPT ); Fri, 14 Oct 2016 15:26:26 -0400 Content-Disposition: inline Sender: netdev-owner@vger.kernel.org List-ID: PTR_ERR(NULL) is success. We have to preserve the error code earlier. Fixes: 7086605a6ab5 ("stmmac: fix error check when init ptp") Signed-off-by: Dan Carpenter --- Applies to net.git tree. diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c index 289d527..5d61fb2 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c @@ -185,8 +185,10 @@ int stmmac_ptp_register(struct stmmac_priv *priv) priv->ptp_clock = ptp_clock_register(&priv->ptp_clock_ops, priv->device); if (IS_ERR(priv->ptp_clock)) { + int ret = PTR_ERR(priv->ptp_clock); + priv->ptp_clock = NULL; - return PTR_ERR(priv->ptp_clock); + return ret; } spin_lock_init(&priv->ptp_lock);