Skip to contentSkip to conversation

mt76: mt7915: fix unused 'mode' variable

PATCH In review Arnd Bergmann 2 participants 2 messages Feb 26, 2021

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 mt76: mt7915: fix unused 'mode' variable

From: Arnd Bergmann <[email protected]>

clang points out a possible corner case in the mt7915_tm_set_tx_cont() function if called with invalid arguments:

drivers/net/wireless/mediatek/mt76/mt7915/testmode.c:593:2: warning: variable 'mode' is used uninitialized whenever switch default is taken [-Wsometimes-uninitialized]

        default:
        ^~~~~~~
drivers/net/wireless/mediatek/mt76/mt7915/testmode.c:597:13: note: uninitialized use occurs here
        rateval =  mode << 6 | rate_idx;
                   ^~~~
drivers/net/wireless/mediatek/mt76/mt7915/testmode.c:506:37: note: initialize the variable 'mode' to silence this warning
        u8 rate_idx = td->tx_rate_idx, mode;
                                           ^

Change it to return an error instead of continuing with invalid data here.

Fixes 3f0caa3cbf94 ("mt76: mt7915: add support for continuous tx in testmode")

---
v2: remove the extra 'break;' after return.

---
 drivers/net/wireless/mediatek/mt76/mt7915/testmode.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7915/testmode.c +2 -2
index 7fb2170a9561..bd798df748ba 100644
@@ -543,7 +543,7 @@ mt7915_tm_set_tx_cont(struct mt7915_phy *phy, bool en)
 		tx_cont->bw = CMD_CBW_20MHZ;
 		break;
 	default:
-		break;
+		return -EINVAL;
 	}
 
 	if (!en) {
@@ -591,7 +591,7 @@ mt7915_tm_set_tx_cont(struct mt7915_phy *phy, bool en)
 		mode = MT_PHY_TYPE_HE_MU;
 		break;
 	default:
-		break;
+		return -EINVAL;
 	}
 
 	rateval =  mode << 6 | rate_idx;
Signature · 7 lines
2.29.2


_______________________________________________
Linux-mediatek mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-mediatek
#1 lore raw

+ linux-wireless

Quoted 18 lines · Arnd Bergmann

From: Arnd Bergmann <[email protected]>

clang points out a possible corner case in the mt7915_tm_set_tx_cont() function if called with invalid arguments:

drivers/net/wireless/mediatek/mt76/mt7915/testmode.c:593:2: warning: variable 'mode' is used uninitialized whenever switch default is taken [-Wsometimes-uninitialized]

        default:
        ^~~~~~~
drivers/net/wireless/mediatek/mt76/mt7915/testmode.c:597:13: note: uninitialized use occurs here
        rateval =  mode << 6 | rate_idx;
                   ^~~~
drivers/net/wireless/mediatek/mt76/mt7915/testmode.c:506:37: note: initialize the variable 'mode' to silence this warning
        u8 rate_idx = td->tx_rate_idx, mode;
                                           ^

Change it to return an error instead of continuing with invalid data here.

Quoted 7 lines
Fixes 3f0caa3cbf94 ("mt76: mt7915: add support for continuous tx in testmode")

---
v2: remove the extra 'break;' after return.

---
 drivers/net/wireless/mediatek/mt76/mt7915/testmode.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

You forgot to Cc linux-wireless and hence patchwork didn't see this, so I applied this manually instead:

c490492f15f6 mt76: mt7915: fix unused 'mode' variable

Signature · 8 lines
https://patchwork.kernel.org/project/linux-wireless/list/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches

_______________________________________________
Linux-mediatek mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-mediatek