* [patch] stmmac: fix an error code in stmmac_ptp_register()
@ 2016-10-14 19:26 Dan Carpenter
2016-10-15 21:35 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Dan Carpenter @ 2016-10-14 19:26 UTC (permalink / raw)
To: Giuseppe Cavallaro; +Cc: Alexandre Torgue, netdev, kernel-janitors
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 <dan.carpenter@oracle.com>
---
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);
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-10-15 21:35 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-10-14 19:26 [patch] stmmac: fix an error code in stmmac_ptp_register() Dan Carpenter
2016-10-15 21:35 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).