]> git.ipfire.org Git - thirdparty/kernel/stable.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:33:36 +0000 (19:33 +0200)
commit22d5b24889ec347a1caebe3b27e157a5a3701d5f
treea2ebce3f28fa7c02759fa9dfc50c9239d4ce1ca5
parent6cbf1615e5f8863df4b4ef415a830c544b45cca6
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