diff options
author | Jakub Kicinski <kuba@kernel.org> | 2021-01-15 03:34:50 +0100 |
---|---|---|
committer | Jakub Kicinski <kuba@kernel.org> | 2021-01-15 03:34:50 +0100 |
commit | 1d9f03c0a15fa01aa14fb295cbc1236403fceb0b (patch) | |
tree | 2161a4e17f383a14e1e235e2deed7142733aca9b /drivers/net/phy | |
parent | Merge branch 'dissect-ptp-l2-packet-header' (diff) | |
parent | Merge tag 'linux-kselftest-fixes-5.11-rc4' of git://git.kernel.org/pub/scm/li... (diff) | |
download | linux-1d9f03c0a15fa01aa14fb295cbc1236403fceb0b.tar.xz linux-1d9f03c0a15fa01aa14fb295cbc1236403fceb0b.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'drivers/net/phy')
-rw-r--r-- | drivers/net/phy/smsc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/phy/smsc.c b/drivers/net/phy/smsc.c index 33372756a451..ddb78fb4d6dc 100644 --- a/drivers/net/phy/smsc.c +++ b/drivers/net/phy/smsc.c @@ -317,7 +317,8 @@ static int smsc_phy_probe(struct phy_device *phydev) /* Make clk optional to keep DTB backward compatibility. */ priv->refclk = clk_get_optional(dev, NULL); if (IS_ERR(priv->refclk)) - dev_err_probe(dev, PTR_ERR(priv->refclk), "Failed to request clock\n"); + return dev_err_probe(dev, PTR_ERR(priv->refclk), + "Failed to request clock\n"); ret = clk_prepare_enable(priv->refclk); if (ret) |