rt2800: remove erroneous duplicate condition
PATCH 1/1 rt2800: remove erroneous duplicate condition
Quoted 13 lines · wbob
Hello Roman,
while reading around
drivers/net/wireless/ralink/rt2x00/rt2800lib.cI stumbled on what I think is an edit of yours made in error in march 2017:https://github.com/torvalds/linux/commit/41977e86#diff-dae5dc10da180f3b055809a48118e18aR5281
RT6352 in line 5281 should not have been introduced as the "else if" below line 5291 can then not take effect for a RT6352 device. Another possibility is for line 5291 to be not for RT6352, but this seems very unlikely. Are you able to clarify still after this substantial time?
Quoted 8 lines
5277: static int
rt2800_init_registers(struct rt2x00_dev *rt2x00dev)
...
5279: } else if (rt2x00_rt(rt2x00dev, RT5390)||
5280:rt2x00_rt(rt2x00dev, RT5392)||
5281:rt2x00_rt(rt2x00dev, RT6352)) {
...
5291: } else if (rt2x00_rt(rt2x00dev, RT6352)) {
...
Hence remove erroneous line 5281 to make the driver actually execute the correct initialization routine for MT7620 chips.
--- drivers/net/wireless/ralink/rt2x00/rt2800lib.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/net/wireless/ralink/rt2x00/rt2800lib.c +1 -2
@@ -5839,8 +5839,7 @@ static int rt2800_init_registers(struct rt2x00_dev *rt2x00dev)rt2800_register_write (rt2x00dev,TX_TXBF_CFG_0 ,0x8000fc21 );rt2800_register_write (rt2x00dev,TX_TXBF_CFG_3 ,0x00009c40 ); }else if (rt2x00_rt (rt2x00dev,RT5390 ) || -rt2x00_rt (rt2x00dev,RT5392 ) || -rt2x00_rt (rt2x00dev,RT6352 )) { +rt2x00_rt (rt2x00dev,RT5392 )) {rt2800_register_write (rt2x00dev,TX_SW_CFG0 ,0x00000404 );rt2800_register_write (rt2x00dev,TX_SW_CFG1 ,0x00080606 );rt2800_register_write (rt2x00dev,TX_SW_CFG2 ,0x00000000 );
Signature · 1 line
2.23.0