]> www.infradead.org Git - users/jedix/linux-maple.git/commit
stmmac: fix check for phydev being open
authorAlexey Brodkin <Alexey.Brodkin@synopsys.com>
Wed, 9 Sep 2015 15:01:08 +0000 (18:01 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 29 Sep 2015 17:26:18 +0000 (19:26 +0200)
commit79866f313766dd2e8e118053e1eb8bd5abd608ac
tree5f477b8de78a72c34a500210127f2e9833d5a1d2
parent6a85820d32b8f908e2dd41b75977fb77768118c2
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@cogentembedded.com>
Cc: Giuseppe Cavallaro <peppe.cavallaro@st.com>
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