diff options
| author | Alexey Brodkin | 2015-09-09 17:01:08 +0200 |
|---|---|---|
| committer | David S. Miller | 2015-09-10 02:07:43 +0200 |
| commit | dfc50fcaad574e5c8c85cbc83eca1426b2413fa4 (patch) | |
| tree | ee257cfea4f0d54ec756c7d98b0cb671e7a1b566 /drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | |
| parent | net: qlcnic: delete redundant memsets (diff) | |
| download | kernel-qcow2-linux-dfc50fcaad574e5c8c85cbc83eca1426b2413fa4.tar.gz kernel-qcow2-linux-dfc50fcaad574e5c8c85cbc83eca1426b2413fa4.tar.xz kernel-qcow2-linux-dfc50fcaad574e5c8c85cbc83eca1426b2413fa4.zip | |
stmmac: fix check for phydev being open
Current check of phydev with IS_ERR(phydev) may make not much sense
because of_phy_connect() returns NULL on failure instead of error value.
Still for checking result of phy_connect() IS_ERR() makes perfect sense.
So let's use combined check IS_ERR_OR_NULL() that covers both cases.
Cc: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Cc: Giuseppe Cavallaro <peppe.cavallaro@st.com>
Cc: linux-kernel@vger.kernel.org
Cc: stable@vger.kernel.org
Cc: David Miller <davem@davemloft.net>
Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/stmicro/stmmac/stmmac_main.c')
| -rw-r--r-- | drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c index 864b476f7fd5..925f2f8659b8 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -837,8 +837,11 @@ static int stmmac_init_phy(struct net_device *dev) interface); } - if (IS_ERR(phydev)) { + if (IS_ERR_OR_NULL(phydev)) { pr_err("%s: Could not attach to PHY\n", dev->name); + if (!phydev) + return -ENODEV; + return PTR_ERR(phydev); } |