diff options
| author | Thierry Reding | 2017-03-10 17:34:56 +0100 |
|---|---|---|
| committer | David S. Miller | 2017-03-13 07:35:20 +0100 |
| commit | 0ad2be79f254965f277fabdd7c64512527208f64 (patch) | |
| tree | 2e8427586e0f42cf20e96f8cb4ebad79b9043aaa /drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | |
| parent | net: stmmac: Disable PTP reference clock on error (diff) | |
| download | kernel-qcow2-linux-0ad2be79f254965f277fabdd7c64512527208f64.tar.gz kernel-qcow2-linux-0ad2be79f254965f277fabdd7c64512527208f64.tar.xz kernel-qcow2-linux-0ad2be79f254965f277fabdd7c64512527208f64.zip | |
net: stmmac: Balance PTP reference clock enable/disable
clk_prepare_enable() and clk_disable_unprepare() for this clock aren't
properly balanced, which can trigger a WARN_ON() in the common clock
framework.
Reviewed-By: Joao Pinto <jpinto@synopsys.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/stmicro/stmmac/stmmac_main.c')
| -rw-r--r-- | drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c index 6060410d2b9e..ce6d7e791f3f 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -1711,6 +1711,10 @@ static int stmmac_hw_setup(struct net_device *dev, bool init_ptp) stmmac_mmc_setup(priv); if (init_ptp) { + ret = clk_prepare_enable(priv->plat->clk_ptp_ref); + if (ret < 0) + netdev_warn(priv->dev, "failed to enable PTP reference clock: %d\n", ret); + ret = stmmac_init_ptp(priv); if (ret == -EOPNOTSUPP) netdev_warn(priv->dev, "PTP not supported by HW\n"); |