BackPup/Linux
1
0 Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-10-07 05:31:08 -04:00
Code Issues Packages Projects Releases Wiki Activity

stmmac: fix check for phydev being open

Browse Source 
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 <[email protected]>
Cc: Giuseppe Cavallaro <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: David Miller <[email protected]>
Signed-off-by: Alexey Brodkin <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
This commit is contained in:
Alexey Brodkin authored and David S. Miller committed 2015-09-09 17:07:43 -07:00
1 parent 1f0ca20853
commit dfc50fcaad
1 file changed
+4 -1
Download Patch File Download Diff File Expand all files Collapse all files
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+4 -1
View File
@@ -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);
}