Skip to content

Commit

Permalink
stmmac: fix an error code in stmmac_ptp_register()
Browse files Browse the repository at this point in the history
PTR_ERR(NULL) is success.  We have to preserve the error code earlier.

Fixes: 7086605 ("stmmac: fix error check when init ptp")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Dan Carpenter authored and David S. Miller committed Oct 15, 2016
1 parent 93966b7 commit 50756eb
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 50756eb

Please sign in to comment.