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: 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>
This commit is contained in:
parent
44d4f8d74e
commit
bced870152
@ -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;
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user