c757c71fd1
Backport fixes including: net: dsa: qca8k: fix missing unlock on error in qca8k_vlan_(add|del) net: dsa: qca8k: check return value of read functions correctly net: dsa: qca8k: add missing check return value in qca8k_phylink_mac_config() net: dsa: qca8k: fix an endian bug in qca8k_get_ethtool_stats() net: dsa: qca8k: check the correct variable in qca8k_set_mac_eee() Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com> Signed-off-by: Matthew Hagan <mnhagan88@gmail.com>
31 lines
980 B
Diff
31 lines
980 B
Diff
From 3d0167f2a627528032821cdeb78b4eab0510460f Mon Sep 17 00:00:00 2001
|
|
From: Dan Carpenter <dan.carpenter@oracle.com>
|
|
Date: Wed, 9 Jun 2021 12:53:03 +0300
|
|
Subject: [PATCH] net: dsa: qca8k: check the correct variable in
|
|
qca8k_set_mac_eee()
|
|
|
|
This code check "reg" but "ret" was intended so the error handling will
|
|
never trigger.
|
|
|
|
Fixes: 7c9896e37807 ("net: dsa: qca8k: check return value of read functions correctly")
|
|
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
|
|
Reviewed-by: Vladimir Oltean <olteanv@gmail.com>
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
---
|
|
drivers/net/dsa/qca8k.c | 4 +---
|
|
1 file changed, 1 insertion(+), 3 deletions(-)
|
|
|
|
--- a/drivers/net/dsa/qca8k.c
|
|
+++ b/drivers/net/dsa/qca8k.c
|
|
@@ -1454,10 +1454,8 @@ qca8k_set_mac_eee(struct dsa_switch *ds,
|
|
|
|
mutex_lock(&priv->reg_mutex);
|
|
ret = qca8k_read(priv, QCA8K_REG_EEE_CTRL, ®);
|
|
- if (reg < 0) {
|
|
- ret = reg;
|
|
+ if (ret < 0)
|
|
goto exit;
|
|
- }
|
|
|
|
if (eee->eee_enabled)
|
|
reg |= lpi_en;
|