[3.16.y-ckt stable] Patch "stmmac: fix check for phydev being open" has been added to staging queue

Luis Henriques luis.henriques at canonical.com
Mon Sep 28 17:31:09 UTC 2015


This is a note to let you know that I have just added a patch titled

    stmmac: fix check for phydev being open

to the linux-3.16.y-queue branch of the 3.16.y-ckt extended stable tree 
which can be found at:

    http://kernel.ubuntu.com/git/ubuntu/linux.git/log/?h=linux-3.16.y-queue

This patch is scheduled to be released in version 3.16.7-ckt18.

If you, or anyone else, feels it should not be added to this tree, please 
reply to this email.

For more information about the 3.16.y-ckt tree, see
https://wiki.ubuntu.com/Kernel/Dev/ExtendedStable

Thanks.
-Luis

------

>From daf906f1c0905a0a49d7773963b946762f79a2c9 Mon Sep 17 00:00:00 2001
From: Alexey Brodkin <Alexey.Brodkin at synopsys.com>
Date: Wed, 9 Sep 2015 18:01:08 +0300
Subject: stmmac: fix check for phydev being open

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 <sergei.shtylyov at cogentembedded.com>
Cc: Giuseppe Cavallaro <peppe.cavallaro at st.com>
Cc: linux-kernel at vger.kernel.org
Cc: David Miller <davem at davemloft.net>
Signed-off-by: Alexey Brodkin <abrodkin at synopsys.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
Signed-off-by: Luis Henriques <luis.henriques at canonical.com>
---
 drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index 641086fc14b5..936cdee0c22e 100644
--- 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_device *dev)

 	phydev = phy_connect(dev, phy_id_fmt, &stmmac_adjust_link, 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);
 	}





More information about the kernel-team mailing list