| Message ID | 1431416594-7758-1-git-send-email-niklass@axis.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
From: Niklas Cassel <niklas.cassel@axis.com> Date: Tue, 12 May 2015 09:43:14 +0200 > 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+ > Fixes: 1fadee0c3645 ("net/phy: micrel: Add clock support for > KSZ8021/KSZ8031") > Reviewed-by: Fabio Estevam <fabio.estevam@freescale.com> > Reviewed-by: Johan Hovold <johan@kernel.org> > Signed-off-by: Niklas Cassel <niklass@axis.com> Applied, thank you. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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;
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+ Fixes: 1fadee0c3645 ("net/phy: micrel: Add clock support for KSZ8021/KSZ8031") Reviewed-by: Fabio Estevam <fabio.estevam@freescale.com> Reviewed-by: Johan Hovold <johan@kernel.org> Signed-off-by: Niklas Cassel <niklass@axis.com> --- drivers/net/phy/micrel.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)