2015-04-23 13:37:33

by Niklas Cassel

[permalink] [raw]
Subject: [PATCH] net: phy: micrel: don't do clock-mode-select if we got NULL clock

Signed-off-by: Niklas Cassel <[email protected]>
---
drivers/net/phy/micrel.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/phy/micrel.c b/drivers/net/phy/micrel.c
index 1190fd8..a422036 100644
--- a/drivers/net/phy/micrel.c
+++ b/drivers/net/phy/micrel.c
@@ -548,7 +548,7 @@ static int kszphy_probe(struct phy_device *phydev)
}

clk = devm_clk_get(&phydev->dev, "rmii-ref");
- if (!IS_ERR(clk)) {
+ if (!IS_ERR_OR_NULL(clk)) {
unsigned long rate = clk_get_rate(clk);
bool rmii_ref_clk_sel_25_mhz;

--
2.1.4


2015-04-23 15:41:38

by David Miller

[permalink] [raw]
Subject: Re: [PATCH] net: phy: micrel: don't do clock-mode-select if we got NULL clock

From: Niklas Cassel <[email protected]>
Date: Thu, 23 Apr 2015 15:37:11 +0200

> Signed-off-by: Niklas Cassel <[email protected]>
> ---
> drivers/net/phy/micrel.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/net/phy/micrel.c b/drivers/net/phy/micrel.c
> index 1190fd8..a422036 100644
> --- a/drivers/net/phy/micrel.c
> +++ b/drivers/net/phy/micrel.c
> @@ -548,7 +548,7 @@ static int kszphy_probe(struct phy_device *phydev)
> }
>
> clk = devm_clk_get(&phydev->dev, "rmii-ref");
> - if (!IS_ERR(clk)) {
> + if (!IS_ERR_OR_NULL(clk)) {
> unsigned long rate = clk_get_rate(clk);
> bool rmii_ref_clk_sel_25_mhz;
>

I do not see anyone in any other networking driver checking for a NULL
return from devm_clk_get().

So either everyone else is wrong, or your change is. I want to find
out which before applying anything.