Re: [PATCH 3.14 40/84] stmmac: fix check for phydev being open
From: Sergei Shtylyov <hidden>
Date: 2015-09-30 11:22:35
Also in:
lkml
Hello. On 9/29/2015 6:18 PM, Greg Kroah-Hartman wrote:
3.14-stable review patch. If anyone has any objections, please let me know.
NAK on the same grounds as the 3.10 patch.
quoted hunk ↗ jump to hunk
------------------ From: Alexey Brodkin <redacted> commit dfc50fcaad574e5c8c85cbc83eca1426b2413fa4 upstream. 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 <redacted> Cc: Giuseppe Cavallaro <redacted> Cc: linux-kernel@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> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> --- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c@@ -810,8 +810,11 @@ static int stmmac_init_phy(struct net_de phydev = phy_connect(dev, phy_id_fmt, &stmmac_adjust_link, interface);
If you really read the change log and compare it with the code, it's
obviousl that the patch is not needed.
- 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);
}MBR, Sergei