| From | Kamal Mostafa <> | Subject | [PATCH 3.19.y-ckt 062/146] net: phy: micrel: Fix regression in kszphy_probe | Date | Wed, 17 Jun 2015 15:22:47 -0700 |
| |
3.19.8-ckt2 -stable review patch. If anyone has any objections, please let me know.
------------------
From: Niklas Cassel <niklas.cassel@axis.com>
commit bced870152161435cc59a53e77f3699f8e8f22ca upstream.
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.
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> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Kamal Mostafa <kamal@canonical.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 3ad8ca7..96061fc 100644 --- a/drivers/net/phy/micrel.c +++ b/drivers/net/phy/micrel.c @@ -520,7 +520,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; -- 1.9.1
|