[PATCH v4] net: phy: micrel: Fix regression in kszphy_probe

[PATCH v4] net: phy: micrel: Fix regression in kszphy_probe

[Niklas Cassel]

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 <stable@vger.kernel.org> # 3.18+
1fadee0c3645 ("net/phy: micrel: Add clock support for
KSZ8021/KSZ8031")
Signed-off-by: Niklas Cassel <niklass@axis.com>
---
 drivers/net/phy/micrel.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/net/phy/micrel.c b/drivers/net/phy/micrel.c
index 1190fd8..ebdc357 100644
--- a/drivers/net/phy/micrel.c
+++ b/drivers/net/phy/micrel.c
@@ -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;
 
-- 
2.1.4

Re: [PATCH v4] net: phy: micrel: Fix regression in kszphy_probe

[Fabio Estevam]

On Mon, May 11, 2015 at 12:21 PM, Niklas Cassel <niklas.cassel@axis.com> wrote:
> 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 <stable@vger.kernel.org> # 3.18+
> 1fadee0c3645 ("net/phy: micrel: Add clock support for
> KSZ8021/KSZ8031")
> Signed-off-by: Niklas Cassel <niklass@axis.com>

Looks good now:

Reviewed-by: Fabio Estevam <fabio.estevam@freescale.com>

Re: [PATCH v4] net: phy: micrel: Fix regression in kszphy_probe

[Johan Hovold]

On Mon, May 11, 2015 at 05:21:06PM +0200, Niklas Cassel wrote:
> 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 <stable@vger.kernel.org> # 3.18+
> 1fadee0c3645 ("net/phy: micrel: Add clock support for
> KSZ8021/KSZ8031")

Looks like you forgot the "Fixes: " tag itself when updating.

> Signed-off-by: Niklas Cassel <niklass@axis.com>

Look good otherwise, feel free to add my

Reviewed-by: Johan Hovold <johan@kernel.org>

when resending (unless David wants to fix it up himself).

Thanks,
Johan