From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D01D719E7ED; Mon, 14 Oct 2024 15:33:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728919997; cv=none; b=eLoHPWlXriy2vHIuA71DcEVFBHk0BUQyCyQc1uyszle2Ga5XUwGRWnR12qgmzFI15pyYZFvW6WujR0iAxKtNacN4KWsl8wFB/XqBimdQTYnxybtLbZr5cYhDJ0V0xE/COIh0wfbfbvdvqqquMbBKMDZyDgZvBfBWm0dKqn4aeA4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728919997; c=relaxed/simple; bh=vWivJPeIywmCke3lhnjoEaQM35plidQoL4WGwtryksY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=R6SL124RAKq19kYQD4I4YBeRJ0uh5RXc7ZTL98GVipag4+BcPAuikVTyJaTvelgpLdffRJYt45qJEZcxXhFlx2u0ekycO7Ln4rEuqBPHNW5+jw7UlpmkrANZRf5E7lA3f8xwJOxoLfBPoUKgnh1S1zpeALpsYgiUYU9ppgC+iWs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=J3RkCriV; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="J3RkCriV" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 418AEC4CEC3; Mon, 14 Oct 2024 15:33:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1728919997; bh=vWivJPeIywmCke3lhnjoEaQM35plidQoL4WGwtryksY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=J3RkCriVrt5L4RxCXFrgWN8qjEyi3EVNdy/pu7eE7zYwhB25UmKoQje9t7aPp1NXU /Qi0WwAZojv9jBfeHfCn7tTKy5m54PMuGgGEFQAP7dHgPZ6wBG7/rFnfpy9PsmhzcP 76H+Sp75gsMEdp4bwQrKudUSDhTegGTEq3YeTY1k= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Christophe JAILLET , Jakub Kicinski , Sasha Levin Subject: [PATCH 6.1 737/798] net: phy: bcm84881: Fix some error handling paths Date: Mon, 14 Oct 2024 16:21:31 +0200 Message-ID: <20241014141247.025323618@linuxfoundation.org> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241014141217.941104064@linuxfoundation.org> References: <20241014141217.941104064@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Christophe JAILLET [ Upstream commit 9234a2549cb6ac038bec36cc7c084218e9575513 ] If phy_read_mmd() fails, the error code stored in 'bmsr' should be returned instead of 'val' which is likely to be 0. Fixes: 75f4d8d10e01 ("net: phy: add Broadcom BCM84881 PHY driver") Signed-off-by: Christophe JAILLET Link: https://patch.msgid.link/3e1755b0c40340d00e089d6adae5bca2f8c79e53.1727982168.git.christophe.jaillet@wanadoo.fr Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- drivers/net/phy/bcm84881.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/phy/bcm84881.c b/drivers/net/phy/bcm84881.c index 9717a1626f3fa..37a64a37b2ae3 100644 --- a/drivers/net/phy/bcm84881.c +++ b/drivers/net/phy/bcm84881.c @@ -120,7 +120,7 @@ static int bcm84881_aneg_done(struct phy_device *phydev) bmsr = phy_read_mmd(phydev, MDIO_MMD_AN, MDIO_AN_C22 + MII_BMSR); if (bmsr < 0) - return val; + return bmsr; return !!(val & MDIO_AN_STAT1_COMPLETE) && !!(bmsr & BMSR_ANEGCOMPLETE); @@ -146,7 +146,7 @@ static int bcm84881_read_status(struct phy_device *phydev) bmsr = phy_read_mmd(phydev, MDIO_MMD_AN, MDIO_AN_C22 + MII_BMSR); if (bmsr < 0) - return val; + return bmsr; phydev->autoneg_complete = !!(val & MDIO_AN_STAT1_COMPLETE) && !!(bmsr & BMSR_ANEGCOMPLETE); -- 2.43.0