mt76: mt7615: fix max_nss in mt7615_eeprom_parse_hw_cap

LorenzoBianconi · gregkh · commit 89ff861a9540 · 2020-02-14T16:53:00.000-05:00
commit d08f301 upstream. Fix u8 cast reading max_nss from MT_TOP_STRAP_STA register in mt7615_eeprom_parse_hw_cap routine Fixes: acf5457 ("mt76: mt7615: read {tx,rx} mask from eeprom") Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org> Signed-off-by: Kalle Valo <kvalo@codeaurora.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/eeprom.c b/drivers/net/wireless/mediatek/mt76/mt7615/eeprom.c
@@ -92,8 +92,9 @@ static int mt7615_check_eeprom(struct mt76_dev *dev)
 
 static void mt7615_eeprom_parse_hw_cap(struct mt7615_dev *dev)
 {
-	u8 val, *eeprom = dev->mt76.eeprom.data;
+	u8 *eeprom = dev->mt76.eeprom.data;
 	u8 tx_mask, rx_mask, max_nss;
+	u32 val;
 
 	val = FIELD_GET(MT_EE_NIC_WIFI_CONF_BAND_SEL,
 			eeprom[MT_EE_WIFI_CONF]);

Original file line number	Diff line number	Diff line change
`@@ -92,8 +92,9 @@ static int mt7615_check_eeprom(struct mt76_dev *dev)`
`92`	`92`
`93`	`93`	`static void mt7615_eeprom_parse_hw_cap(struct mt7615_dev *dev)`
`94`	`94`	`{`
`95`		`- u8 val, *eeprom = dev->mt76.eeprom.data;`
	`95`	`+ u8 *eeprom = dev->mt76.eeprom.data;`
`96`	`96`	`u8 tx_mask, rx_mask, max_nss;`
	`97`	`+ u32 val;`
`97`	`98`
`98`	`99`	`val = FIELD_GET(MT_EE_NIC_WIFI_CONF_BAND_SEL,`
`99`	`100`	`eeprom[MT_EE_WIFI_CONF]);`