[PATCH net-next 08/12] net: dsa: qca8k: Update error handling
From: Luke Howard <hidden>
Date: 2026-07-03 07:31:15
Also in:
lkml
Subsystem:
networking drivers, networking [dsa], the rest · Maintainers:
Andrew Lunn, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Vladimir Oltean, Linus Torvalds
From: Andrew Lunn <andrew@lunn.ch> Now that dsa_inband_request() can return positive values for the length of the received reply, the return value checking needs to change. This driver only uses short messages, and it is unlikely the hardware will actually receive messages of less then 64 bytes. So don't check the message length. However, ensure the return value is either a negative error code, or 0. Ensure all users of dsa_inband_request() return either a negative error, or 0 on success, so as not to change the API. Signed-off-by: Andrew Lunn <andrew@lunn.ch> --- drivers/net/dsa/qca/qca8k-8xxx.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/drivers/net/dsa/qca/qca8k-8xxx.c b/drivers/net/dsa/qca/qca8k-8xxx.c
index ffa3b1ba23bed..94332497902c2 100644
--- a/drivers/net/dsa/qca/qca8k-8xxx.c
+++ b/drivers/net/dsa/qca/qca8k-8xxx.c@@ -341,6 +341,7 @@ static int qca8k_read_eth(struct qca8k_priv *priv, u32 reg, u32 *val, int len) QCA8K_ETHERNET_TIMEOUT); if (ret < 0) goto out; + ret = 0; *val = data[0]; if (len > QCA_HDR_MGMT_DATA1_LEN)
@@ -574,7 +575,7 @@ qca8k_phy_eth_busy_wait(struct qca8k_mgmt_eth_data *mgmt_eth_data, data, sizeof(data), QCA8K_ETHERNET_TIMEOUT); - if (ret) + if (ret < 0) return ret; *val = data[0];
@@ -664,7 +665,7 @@ qca8k_phy_eth_command(struct qca8k_priv *priv, bool read, int phy, NULL, 0, QCA8K_ETHERNET_TIMEOUT); - if (ret) { + if (ret < 0) { kfree_skb(read_skb); goto exit; }
@@ -685,7 +686,7 @@ qca8k_phy_eth_command(struct qca8k_priv *priv, bool read, int phy, resp_data, sizeof(resp_data), QCA8K_ETHERNET_TIMEOUT); - if (ret) + if (ret < 0) goto exit; ret = resp_data[0] & QCA8K_MDIO_MASTER_DATA_MASK;
--
2.43.0