openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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 <stable@vger.kernel.org> # 3.18+
Fixes: 1fadee0c36 ("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>
This commit is contained in:
Niklas Cassel 2015-05-12 09:43:14 +02:00 committed by David S. Miller
parent 44d4f8d74e
commit bced870152
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/net/phy/micrel.c
View File

@ -548,7 +548,8 @@ static int kszphy_probe(struct phy_device *phydev)
} }
clk = devm_clk_get(&phydev->dev, "rmii-ref"); 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); unsigned long rate = clk_get_rate(clk);
bool rmii_ref_clk_sel_25_mhz; bool rmii_ref_clk_sel_25_mhz;