summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarco Felsch <m.felsch@pengutronix.de>2021-01-11 09:59:32 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-01-23 16:04:03 +0100
commitc469b23d1b541cbdd6831b468acd4bfb849180c6 (patch)
tree53902776476b5ed8c9eb8d273233b89c93eddf2f
parentad2175c9fb27b5e0c6fef08143d94129c86a153b (diff)
downloadlinux-c469b23d1b541cbdd6831b468acd4bfb849180c6.tar.gz
linux-c469b23d1b541cbdd6831b468acd4bfb849180c6.tar.bz2
linux-c469b23d1b541cbdd6831b468acd4bfb849180c6.zip
net: phy: smsc: fix clk error handling
[ Upstream commit a18caa97b1bda0a3d126a7be165ddcfc56c2dde6 ] Commit bedd8d78aba3 ("net: phy: smsc: LAN8710/20: add phy refclk in support") added the phy clk support. The commit already checks if clk_get_optional() throw an error but instead of returning the error it ignores it. Fixes: bedd8d78aba3 ("net: phy: smsc: LAN8710/20: add phy refclk in support") Suggested-by: Jakub Kicinski <kuba@kernel.org> Signed-off-by: Marco Felsch <m.felsch@pengutronix.de> Reviewed-by: Andrew Lunn <andrew@lunn.ch> Link: https://lore.kernel.org/r/20210111085932.28680-1-m.felsch@pengutronix.de Signed-off-by: Jakub Kicinski <kuba@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/net/phy/smsc.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/phy/smsc.c b/drivers/net/phy/smsc.c
index 0fc39ac5ca88..10722fed666d 100644
--- a/drivers/net/phy/smsc.c
+++ b/drivers/net/phy/smsc.c
@@ -284,7 +284,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)