Commit 7086605a authored by Giuseppe CAVALLARO's avatar Giuseppe CAVALLARO Committed by David S. Miller

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: default avatarGiuseppe Cavallaro <peppe.cavallaro@st.com>
Cc: Alexandre TORGUE <alexandre.torgue@st.com>
Cc: Rayagond Kokatanur <rayagond@vayavyalabs.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent be9b3174
...@@ -1709,8 +1709,8 @@ static int stmmac_hw_setup(struct net_device *dev, bool init_ptp) ...@@ -1709,8 +1709,8 @@ static int stmmac_hw_setup(struct net_device *dev, bool init_ptp)
if (init_ptp) { if (init_ptp) {
ret = stmmac_init_ptp(priv); ret = stmmac_init_ptp(priv);
if (ret && ret != -EOPNOTSUPP) if (ret)
pr_warn("%s: failed PTP initialisation\n", __func__); netdev_warn(priv->dev, "PTP support cannot init.\n");
} }
#ifdef CONFIG_DEBUG_FS #ifdef CONFIG_DEBUG_FS
......
...@@ -186,10 +186,12 @@ int stmmac_ptp_register(struct stmmac_priv *priv) ...@@ -186,10 +186,12 @@ int stmmac_ptp_register(struct stmmac_priv *priv)
priv->device); priv->device);
if (IS_ERR(priv->ptp_clock)) { if (IS_ERR(priv->ptp_clock)) {
priv->ptp_clock = NULL; priv->ptp_clock = NULL;
pr_err("ptp_clock_register() failed on %s\n", priv->dev->name); return PTR_ERR(priv->ptp_clock);
} else if (priv->ptp_clock) }
pr_debug("Added PTP HW clock successfully on %s\n",
priv->dev->name); spin_lock_init(&priv->ptp_lock);
netdev_dbg(priv->dev, "Added PTP HW clock successfully\n");
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment