mirror of
https://github.com/immortalwrt/immortalwrt.git
synced 2025-08-14 14:19:53 +08:00
456b7a5d48
This is an automatically generated commit which aids following Kernel patch history, as git will see the move and copy as a rename thus defeating the purpose. For the original discussion see: https://lists.openwrt.org/pipermail/openwrt-devel/2023-October/041673.html Signed-off-by: Mieczyslaw Nalewaj <namiltd@yahoo.com> Link: https://github.com/openwrt/openwrt/pull/16547 Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
48 lines
1.6 KiB
Diff
48 lines
1.6 KiB
Diff
From 87c33315af380ca12a2e59ac94edad4fe0481b4c Mon Sep 17 00:00:00 2001
|
|
From: Dan Carpenter <dan.carpenter@linaro.org>
|
|
Date: Fri, 5 Apr 2024 13:08:59 +0300
|
|
Subject: [PATCH] net: phy: air_en8811h: fix some error codes
|
|
|
|
These error paths accidentally return "ret" which is zero/success
|
|
instead of the correct error code.
|
|
|
|
Fixes: 71e79430117d ("net: phy: air_en8811h: Add the Airoha EN8811H PHY driver")
|
|
Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
|
|
Reviewed-by: Simon Horman <horms@kernel.org>
|
|
Link: https://lore.kernel.org/r/7ef2e230-dfb7-4a77-8973-9e5be1a99fc2@moroto.mountain
|
|
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
|
---
|
|
drivers/net/phy/air_en8811h.c | 8 ++++----
|
|
1 file changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
--- a/drivers/net/phy/air_en8811h.c
|
|
+++ b/drivers/net/phy/air_en8811h.c
|
|
@@ -272,11 +272,11 @@ static int __air_buckpbus_reg_read(struc
|
|
|
|
pbus_data_high = __phy_read(phydev, AIR_BPBUS_RD_DATA_HIGH);
|
|
if (pbus_data_high < 0)
|
|
- return ret;
|
|
+ return pbus_data_high;
|
|
|
|
pbus_data_low = __phy_read(phydev, AIR_BPBUS_RD_DATA_LOW);
|
|
if (pbus_data_low < 0)
|
|
- return ret;
|
|
+ return pbus_data_low;
|
|
|
|
*pbus_data = pbus_data_low | (pbus_data_high << 16);
|
|
return 0;
|
|
@@ -323,11 +323,11 @@ static int __air_buckpbus_reg_modify(str
|
|
|
|
pbus_data_high = __phy_read(phydev, AIR_BPBUS_RD_DATA_HIGH);
|
|
if (pbus_data_high < 0)
|
|
- return ret;
|
|
+ return pbus_data_high;
|
|
|
|
pbus_data_low = __phy_read(phydev, AIR_BPBUS_RD_DATA_LOW);
|
|
if (pbus_data_low < 0)
|
|
- return ret;
|
|
+ return pbus_data_low;
|
|
|
|
pbus_data_old = pbus_data_low | (pbus_data_high << 16);
|
|
pbus_data_new = (pbus_data_old & ~mask) | set;
|