lkml.org 
[lkml]   [2019]   [Feb]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 4.14 29/40] net: altera_tse: fix connect_local_phy error path
    Date
    From: Atsushi Nemoto <atsushi.nemoto@sord.co.jp>

    [ Upstream commit 17b42a20d7ca59377788c6a2409e77569570cc10 ]

    The connect_local_phy should return NULL (not negative errno) on
    error, since its caller expects it.

    Signed-off-by: Atsushi Nemoto <atsushi.nemoto@sord.co.jp>
    Acked-by: Thor Thayer <thor.thayer@linux.intel.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/ethernet/altera/altera_tse_main.c | 4 +++-
    1 file changed, 3 insertions(+), 1 deletion(-)

    diff --git a/drivers/net/ethernet/altera/altera_tse_main.c b/drivers/net/ethernet/altera/altera_tse_main.c
    index 527908c7e384..84def1ff6cb6 100644
    --- a/drivers/net/ethernet/altera/altera_tse_main.c
    +++ b/drivers/net/ethernet/altera/altera_tse_main.c
    @@ -714,8 +714,10 @@ static struct phy_device *connect_local_phy(struct net_device *dev)

    phydev = phy_connect(dev, phy_id_fmt, &altera_tse_adjust_link,
    priv->phy_iface);
    - if (IS_ERR(phydev))
    + if (IS_ERR(phydev)) {
    netdev_err(dev, "Could not attach to PHY\n");
    + phydev = NULL;
    + }

    } else {
    int ret;
    --
    2.19.1
    \
     
     \ /
      Last update: 2019-02-15 03:25    [W:2.214 / U:0.212 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site