releases/4.14.105/net-altera_tse-fix-connect_local_phy-error-path.patch

   1 From 3a083ecda005012ed9cc8786e156420115fd8b42 Mon Sep 17 00:00:00 2001
   2 From: Atsushi Nemoto <atsushi.nemoto@sord.co.jp>
   3 Date: Mon, 21 Jan 2019 17:26:41 +0900
   4 Subject: net: altera_tse: fix connect_local_phy error path
   5
   6 [ Upstream commit 17b42a20d7ca59377788c6a2409e77569570cc10 ]
   7
   8 The connect_local_phy should return NULL (not negative errno) on
   9 error, since its caller expects it.
  10
  11 Signed-off-by: Atsushi Nemoto <atsushi.nemoto@sord.co.jp>
  12 Acked-by: Thor Thayer <thor.thayer@linux.intel.com>
  13 Signed-off-by: David S. Miller <davem@davemloft.net>
  14 Signed-off-by: Sasha Levin <sashal@kernel.org>
  15 ---
  16  drivers/net/ethernet/altera/altera_tse_main.c | 4 +++-
  17  1 file changed, 3 insertions(+), 1 deletion(-)
  18
  19 diff --git a/drivers/net/ethernet/altera/altera_tse_main.c b/drivers/net/ethernet/altera/altera_tse_main.c
  20 index 527908c7e3845..84def1ff6cb64 100644
  21 --- a/drivers/net/ethernet/altera/altera_tse_main.c
  22 +++ b/drivers/net/ethernet/altera/altera_tse_main.c
  23 @@ -714,8 +714,10 @@ static struct phy_device *connect_local_phy(struct net_device *dev)
  24
  25                 phydev = phy_connect(dev, phy_id_fmt, &altera_tse_adjust_link,
  26                                      priv->phy_iface);
  27 -               if (IS_ERR(phydev))
  28 +               if (IS_ERR(phydev)) {
  29                         netdev_err(dev, "Could not attach to PHY\n");
  30 +                       phydev = NULL;
  31 +               }
  32
  33         } else {
  34                 int ret;
  35 --
  36 2.19.1
  37