From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 964B5C43381 for ; Fri, 22 Mar 2019 13:20:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6549221873 for ; Fri, 22 Mar 2019 13:20:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553260846; bh=tkV1TpvmJe77mtEi11D+/CaNkHmZuRRuQKV4rvFnYUY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=zzbqcV665lr9ThRVLjMJFnCnzIY4yYPNghSKHQDIefpmhJQPThT2slejOVdtgbIDC G+PTk2zWfaQ5BYQ6fZhvTyksOgKJA/uZwbFR+KevzYwGV3jFvjofFGe0MJ82h0SQ+v +juLdnEH5OJrqP1uCaaDVf2pSrKtFX083vIL7WJw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728504AbfCVLVM (ORCPT ); Fri, 22 Mar 2019 07:21:12 -0400 Received: from mail.kernel.org ([198.145.29.99]:47670 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728542AbfCVLVM (ORCPT ); Fri, 22 Mar 2019 07:21:12 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id BA35421917; Fri, 22 Mar 2019 11:21:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553253671; bh=tkV1TpvmJe77mtEi11D+/CaNkHmZuRRuQKV4rvFnYUY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LGryAmeHRYPCBFmWd0moudEEbHn8qdYJ3ca2PR1xb4jukooiM+WBYAEjxYULt+6jG WTGz+eTHxwWHijDBOo0lZdpX3RUQlxgmu06detUvKA/EgyXLQlpcfEtuVHNm8OKKIB 428L2FgoMdfleJnH+v/A6QlGIjJgS5j8pvzfl4ng= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Atsushi Nemoto , Thor Thayer , "David S. Miller" , Sasha Levin Subject: [PATCH 3.18 036/134] net: altera_tse: fix connect_local_phy error path Date: Fri, 22 Mar 2019 12:14:09 +0100 Message-Id: <20190322111212.363111558@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190322111210.465931067@linuxfoundation.org> References: <20190322111210.465931067@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org 3.18-stable review patch. If anyone has any objections, please let me know. ------------------ [ 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 Acked-by: Thor Thayer Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- 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 2eb6404755b1f..c1b599c521953 100644 --- a/drivers/net/ethernet/altera/altera_tse_main.c +++ b/drivers/net/ethernet/altera/altera_tse_main.c @@ -706,8 +706,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