lkml.org 
[lkml]   [2015]   [Sep]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.1 108/159] stmmac: fix check for phydev being open
    Date
    4.1-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Alexey Brodkin <Alexey.Brodkin@synopsys.com>

    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 | 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
    @@ -829,8 +829,11 @@ static int stmmac_init_phy(struct net_de

    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);
    }




    \
     
     \ /
      Last update: 2015-09-27 00:01    [W:2.937 / U:0.060 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site