diff options
| author |   Dan Carpenter <dan.carpenter@oracle.com> | 2016-10-14 22:26:11 +0300 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2016-10-15 17:35:30 -0400 |
| commit | 50756ebecf69276b8a908409fa32c123bb12420b (patch) | |
| tree | 4c92bc7d6168728e80b465240d56a143e9dd52ef /drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c | |
| parent | net: qcom/emac: disable interrupts before calling phy_disconnect (diff) | |
| download | linux-dev-50756ebecf69276b8a908409fa32c123bb12420b.tar.xz linux-dev-50756ebecf69276b8a908409fa32c123bb12420b.zip | |
stmmac: fix an error code in stmmac_ptp_register()
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>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c')
| -rw-r--r-- | drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c index 289d52725a6c..5d61fb27219a 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); |