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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,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 B7EF8C432C0 for ; Fri, 22 Nov 2019 06:22:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7CF0620674 for ; Fri, 22 Nov 2019 06:22:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574403724; bh=X6ZU5Ku5AFuY7y/gtONIX9Zv1xUuXsUKp1Q94UlImcQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=0bFF0VFOAjZG8EqzkjAtOQO6htvL96/IRlZDg4NUqgUO3/NNmL1HRcpQsBMbw7ptB qNRKPvqnbzp8B47lvjVynacqSt4WoKWmh59qWIDd6g6bGs1PCSeWZjAIQ5sxbl1U5D HSTcO2DMYw2jvjHRhW/XBWPMyqKpEl0ieYKe9Ato= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728410AbfKVFwH (ORCPT ); Fri, 22 Nov 2019 00:52:07 -0500 Received: from mail.kernel.org ([198.145.29.99]:57296 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728341AbfKVFv5 (ORCPT ); Fri, 22 Nov 2019 00:51:57 -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 6764C20726; Fri, 22 Nov 2019 05:51:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574401917; bh=X6ZU5Ku5AFuY7y/gtONIX9Zv1xUuXsUKp1Q94UlImcQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=aXzV/VsdfXLdr7pFNF2v5/lvNapU5OKetXJHEg0MH9sAVVRzorJEBYfez4ugbHu/f XrNUcehJXVmIyy0WunBLH8ws/Ig+7QsCvCL7izSSE6JEwegxACM3ydoi9cTqayj6oW hTNs42pCQpdK+MXjEKXY9fJa+TQLb/Q3Sf1F4+jA= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Kangjie Lu , "David S . Miller" , Sasha Levin , netdev@vger.kernel.org Subject: [PATCH AUTOSEL 4.19 147/219] net: dsa: bcm_sf2: Propagate error value from mdio_write Date: Fri, 22 Nov 2019 00:47:59 -0500 Message-Id: <20191122054911.1750-140-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191122054911.1750-1-sashal@kernel.org> References: <20191122054911.1750-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review 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: Kangjie Lu [ Upstream commit e49505f7255be8ced695919c08a29bf2c3d79616 ] Both bcm_sf2_sw_indir_rw and mdiobus_write_nested could fail, so let's return their error codes upstream. Signed-off-by: Kangjie Lu Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/dsa/bcm_sf2.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/net/dsa/bcm_sf2.c b/drivers/net/dsa/bcm_sf2.c index ca3655d28e00f..1ffdad278899f 100644 --- a/drivers/net/dsa/bcm_sf2.c +++ b/drivers/net/dsa/bcm_sf2.c @@ -309,11 +309,10 @@ static int bcm_sf2_sw_mdio_write(struct mii_bus *bus, int addr, int regnum, * send them to our master MDIO bus controller */ if (addr == BRCM_PSEUDO_PHY_ADDR && priv->indir_phy_mask & BIT(addr)) - bcm_sf2_sw_indir_rw(priv, 0, addr, regnum, val); + return bcm_sf2_sw_indir_rw(priv, 0, addr, regnum, val); else - mdiobus_write_nested(priv->master_mii_bus, addr, regnum, val); - - return 0; + return mdiobus_write_nested(priv->master_mii_bus, addr, + regnum, val); } static irqreturn_t bcm_sf2_switch_0_isr(int irq, void *dev_id) -- 2.20.1