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.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,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 2923DC4360F for ; Fri, 15 Feb 2019 02:30:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DFABA2175B for ; Fri, 15 Feb 2019 02:30:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1550197853; bh=ByiNypkCvkOvmhQWX7z8vsj3DQDhJHMvlPyRpk4FhjM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=h2zjyQbMJXLkbUXjY+VB0UXEQ33/Byj9pvWKsJTzbXhJ5eRfrwFTKPnwrH+LXp2Jd vgfG+4cMSnroGo/9ULJfIik7hk666INdkGXQKG8qc1wpSTXNHu/swFm4VI4d7PuMdG BRk6Yo8Jbur4ApUVJfQrt935Nh2ca0pQ/yjDGDDs= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2404413AbfBOCMo (ORCPT ); Thu, 14 Feb 2019 21:12:44 -0500 Received: from mail.kernel.org ([198.145.29.99]:52644 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2404327AbfBOCMh (ORCPT ); Thu, 14 Feb 2019 21:12:37 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id AA44221B1C; Fri, 15 Feb 2019 02:12:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1550196757; bh=ByiNypkCvkOvmhQWX7z8vsj3DQDhJHMvlPyRpk4FhjM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KK+RKafCd32+MBixCazkeoqML5876kU8Z0WlnxsHjmLQiLV7ailojoGIefRyi0h+E q0DhFrMdS+gM2T4bQlWad4ry2+S/eGk1fuyCFpT1ZpKqxJuALNJTw6b4me/7W0xASi bR9dohI1fgLUyCnTUlRLz4KRsB76XdZuHo9YBMWI= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Atsushi Nemoto , "David S . Miller" , Sasha Levin , netdev@vger.kernel.org Subject: [PATCH AUTOSEL 4.19 46/65] net: altera_tse: fix connect_local_phy error path Date: Thu, 14 Feb 2019 21:11:02 -0500 Message-Id: <20190215021121.177674-46-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190215021121.177674-1-sashal@kernel.org> References: <20190215021121.177674-1-sashal@kernel.org> MIME-Version: 1.0 X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Atsushi Nemoto [ 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 baca8f704a45..c3c1195021a2 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