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.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,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 C1437C432C3 for ; Tue, 3 Dec 2019 23:03:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 91FB2207DD for ; Tue, 3 Dec 2019 23:03:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1575414194; bh=mU2WWZMRT10ZM1zqwCE1vSAm0rosjGx9eVwJBKpUqIY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=eWBpTMKhcMXidh7kl0SZ3ArrH9Spu+KdGgkEsQe/DxApgG33Adh2Hvx3T9yStiDyo dPvdYXZn2YgUST4Jca8jy9xQ7CbEFXlpUPlqjwVZ0ddwimmVf0rkMqy0H4ql6YIs9Z KUvoIFzNbYv84KS3ufcKvwaD891wh7K+s2xu65CE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729870AbfLCWx1 (ORCPT ); Tue, 3 Dec 2019 17:53:27 -0500 Received: from mail.kernel.org ([198.145.29.99]:46688 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728759AbfLCWx0 (ORCPT ); Tue, 3 Dec 2019 17:53:26 -0500 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 896562053B; Tue, 3 Dec 2019 22:53:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1575413606; bh=mU2WWZMRT10ZM1zqwCE1vSAm0rosjGx9eVwJBKpUqIY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YrgUxoQKhToaT3TKv9Z2OIqiZN0zozFyYJC6C4guLEvXE+oDASM4uHsV23LSecmnW vuL+90sr6WiqsQEqK7yuxHCRIDGqVJi3SxsDimxWZ82RguxHK9qEtNz1CeFn1F+ERW 4VLcczOtQeN+0ThmjSGrG8XcK94NjeTD2NuTw9CQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Kangjie Lu , "David S. Miller" , Sasha Levin Subject: [PATCH 4.19 192/321] atl1e: checking the status of atl1e_write_phy_reg Date: Tue, 3 Dec 2019 23:34:18 +0100 Message-Id: <20191203223437.106265798@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191203223427.103571230@linuxfoundation.org> References: <20191203223427.103571230@linuxfoundation.org> User-Agent: quilt/0.66 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 From: Kangjie Lu [ Upstream commit ff07d48d7bc0974d4f96a85a4df14564fb09f1ef ] atl1e_write_phy_reg() could fail. The fix issues an error message when it fails. Signed-off-by: Kangjie Lu Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/atheros/atl1e/atl1e_main.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/atheros/atl1e/atl1e_main.c b/drivers/net/ethernet/atheros/atl1e/atl1e_main.c index 9dc6da039a6d9..3164aad29bcf8 100644 --- a/drivers/net/ethernet/atheros/atl1e/atl1e_main.c +++ b/drivers/net/ethernet/atheros/atl1e/atl1e_main.c @@ -473,7 +473,9 @@ static void atl1e_mdio_write(struct net_device *netdev, int phy_id, { struct atl1e_adapter *adapter = netdev_priv(netdev); - atl1e_write_phy_reg(&adapter->hw, reg_num & MDIO_REG_ADDR_MASK, val); + if (atl1e_write_phy_reg(&adapter->hw, + reg_num & MDIO_REG_ADDR_MASK, val)) + netdev_err(netdev, "write phy register failed\n"); } static int atl1e_mii_ioctl(struct net_device *netdev, -- 2.20.1