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,USER_AGENT_GIT autolearn=ham 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 C88C4C43381 for ; Mon, 4 Mar 2019 08:34:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 96822208E4 for ; Mon, 4 Mar 2019 08:34:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1551688481; bh=lLgJwMJJvX2wkT15C7ehCXQBUsHIOatGx8Czd1KJk0I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=j8DoAbV2o5p7P1Z9lqceLk5tsRXtUdcF3VOaZJ8RN+VZPxuHbeguqILzQAB0fOOVT kAor457itqUBJW+jIsR6lHsiSa7v8YwA1ZpVMdDvJk132Fg0go3Ga0CChk4n9dkEMo DP8nrlkQKUXLYStK2BmpXZ61gKYAtvmXsG9lieB8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728321AbfCDIek (ORCPT ); Mon, 4 Mar 2019 03:34:40 -0500 Received: from mail.kernel.org ([198.145.29.99]:41016 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728283AbfCDIef (ORCPT ); Mon, 4 Mar 2019 03:34:35 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.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 56C9320836; Mon, 4 Mar 2019 08:34:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1551688474; bh=lLgJwMJJvX2wkT15C7ehCXQBUsHIOatGx8Czd1KJk0I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bF1XJjt7cqTxkNXZ3qRMttKG3LaMPBxpI3ZZDaDeVCuwK4UIZS4j/H5yhjdI2zGh2 QjFwQw+uk0sK20iAZRHHKlFg4jYOSbGV/tN28ThDCge9Y9GvzJcXjl04xoLo74jDrV SncKi1lUnVwpn4I0b7HTJY5sx7qk2XO8uE8b97Bw= 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 4.20 49/88] net: altera_tse: fix connect_local_phy error path Date: Mon, 4 Mar 2019 09:22:32 +0100 Message-Id: <20190304081632.494930321@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190304081630.610632175@linuxfoundation.org> References: <20190304081630.610632175@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: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.20-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 02921d877c08a..aa1d1f5339d2a 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