Groups > linux.kernel > #1220356

[PATCH] stmmac: fix check for phydev being open

Path	csiph.com!eternal-september.org!feeder.eternal-september.org!aioe.org!bofh.it!news.nic.it!robomod
From	Alexey Brodkin <Alexey.Brodkin@synopsys.com>
Newsgroups	linux.kernel
Subject	[PATCH] stmmac: fix check for phydev being open
Date	Mon, 07 Sep 2015 20:20:01 +0200
Message-ID	<q69bj-4Sh-1@gated-at.bofh.it> (permalink)
X-Original-To	netdev@vger.kernel.org
X-Mailer	git-send-email 2.4.3
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	38
Organization	linux.* mail to news gateway
X-Original-Cc	Alexey Brodkin <Alexey.Brodkin@synopsys.com>, Giuseppe Cavallaro <peppe.cavallaro@st.com>, arc-linux-dev@synopsys.com, linux-kernel@vger.kernel.org, stable@vger.kernel.org, David Miller <davem@davemloft.net>
X-Original-Date	Mon, 7 Sep 2015 21:15:09 +0300
X-Original-Message-ID	<1441649709-12325-1-git-send-email-abrodkin@synopsys.com>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1220356

Show key headers only | View raw

Current implementation via IS_ERR(phydev) may make no sense because
of_phy_attach() returns NULL on failure instead of error value.

Still for checking result of phy_connect() IS_ERR() is useful.

So adding explicit check for NULL.

Cc: Giuseppe Cavallaro <peppe.cavallaro@st.com>
Cc: arc-linux-dev@synopsys.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>
---
 drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index 864b476..ad2ce3e 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -837,7 +837,7 @@ static int stmmac_init_phy(struct net_device *dev)
 				     interface);
 	}
 
-	if (IS_ERR(phydev)) {
+	if (!phydev || IS_ERR(phydev)) {
 		pr_err("%s: Could not attach to PHY\n", dev->name);
 		return PTR_ERR(phydev);
 	}
-- 
2.4.3

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH] stmmac: fix check for phydev being open Alexey Brodkin <Alexey.Brodkin@synopsys.com> - 2015-09-07 20:20 +0200
  Re: [PATCH] stmmac: fix check for phydev being open Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> - 2015-09-07 20:30 +0200

csiph-web