stmmac: fix error check when init ptp
This patch fixes a problem when propagated the failure of ptp_clock_register to open function. Signed-off-by: Giuseppe Cavallaro <peppe.cavallaro@st.com> Cc: Alexandre TORGUE <alexandre.torgue@st.com> Cc: Rayagond Kokatanur <rayagond@vayavyalabs.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
be9b3174c4
commit
7086605a6a
2 changed files with 8 additions and 6 deletions
|
@ -1709,8 +1709,8 @@ static int stmmac_hw_setup(struct net_device *dev, bool init_ptp)
|
|||
|
||||
if (init_ptp) {
|
||||
ret = stmmac_init_ptp(priv);
|
||||
if (ret && ret != -EOPNOTSUPP)
|
||||
pr_warn("%s: failed PTP initialisation\n", __func__);
|
||||
if (ret)
|
||||
netdev_warn(priv->dev, "PTP support cannot init.\n");
|
||||
}
|
||||
|
||||
#ifdef CONFIG_DEBUG_FS
|
||||
|
|
|
@ -186,10 +186,12 @@ int stmmac_ptp_register(struct stmmac_priv *priv)
|
|||
priv->device);
|
||||
if (IS_ERR(priv->ptp_clock)) {
|
||||
priv->ptp_clock = NULL;
|
||||
pr_err("ptp_clock_register() failed on %s\n", priv->dev->name);
|
||||
} else if (priv->ptp_clock)
|
||||
pr_debug("Added PTP HW clock successfully on %s\n",
|
||||
priv->dev->name);
|
||||
return PTR_ERR(priv->ptp_clock);
|
||||
}
|
||||
|
||||
spin_lock_init(&priv->ptp_lock);
|
||||
|
||||
netdev_dbg(priv->dev, "Added PTP HW clock successfully\n");
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue