Skip to contentSkip to conversation

net: phy: micrel: Fix regression in kszphy_probe

PATCH Applied Niklas Cassel 2 participants 2 messages May 12, 2015 – May 13, 2015

Subsystems (4)
Networking Network drivers Stable branch Ethernet PHY
lore
Share & tools
lore

Niklas Cassel

author
#0 lore raw

PATCH v5 1/1 net: phy: micrel: Fix regression in kszphy_probe

Don't do clock-mode-select if clk == NULL,
since when building without CONFIG_HAVE_CLK,
clk_get returns NULL and clk_get_rate returns 0.

Doing clock-mode-select in this cause causes kszphy_probe to return -EINVAL and thus prevents the device from being probed.

The original code (before regression) would return 0 when building without CONFIG_HAVE_CLK.

Cc stable <[email protected]> # 3.18+
Fixes 1fadee0c3645 ("net/phy: micrel: Add clock support for

KSZ8021/KSZ8031")

Reviewed-by Fabio Estevam <[email protected]>
Reviewed-by Johan Hovold <[email protected]>
Signed-off-by Niklas Cassel <[email protected]>
---
 drivers/net/phy/micrel.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/phy/micrel.c +2 -1
index 1190fd8..ebdc357 100644
@@ -548,7 +548,8 @@ static int kszphy_probe(struct phy_device *phydev)
 	}
 
 	clk = devm_clk_get(&phydev->dev, "rmii-ref");
-	if (!IS_ERR(clk)) {
+	/* NOTE: clk may be NULL if building without CONFIG_HAVE_CLK */
+	if (!IS_ERR_OR_NULL(clk)) {
 		unsigned long rate = clk_get_rate(clk);
 		bool rmii_ref_clk_sel_25_mhz;
Signature · 1 line
2.1.4
maintainer Applied
#1 lore raw

From: Niklas Cassel <[email protected]>
Date: Tue, 12 May 2015 09:43:14 +0200

Quoted 10 lines

Don't do clock-mode-select if clk == NULL,
since when building without CONFIG_HAVE_CLK,
clk_get returns NULL and clk_get_rate returns 0.

Doing clock-mode-select in this cause causes kszphy_probe to return -EINVAL and thus prevents the device from being probed.

The original code (before regression) would return 0 when building without CONFIG_HAVE_CLK.

Quoted 6 lines
Cc stable <[email protected]> # 3.18+
Fixes 1fadee0c3645 ("net/phy: micrel: Add clock support for

KSZ8021/KSZ8031")

Reviewed-by Fabio Estevam <[email protected]>
Reviewed-by Johan Hovold <[email protected]>
Signed-off-by Niklas Cassel <[email protected]>

Applied, thank you.