• Daniel Golle's avatar
    rt2800: remove errornous duplicate condition · a1f7c2ca
    Daniel Golle authored
    On 2019-10-28 06:07, wbob wrote:
    > Hello Roman,
    >
    > while reading around drivers/net/wireless/ralink/rt2x00/rt2800lib.c
    > I 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?
    >
    > 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 errornous line 5281 to make the driver actually
    execute the correct initialization routine for MT7620 chips.
    
    As it was requested by Stanislaw Gruszka remove setting values of
    MIMO_PS_CFG and TX_PIN_CFG. MIMO_PS_CFG is responsible for MIMO
    power-safe mode (which is disabled), hence we can drop setting it.
    TX_PIN_CFG is set correctly in other functions, and as setting this
    value breaks some devices, rather don't set it here during init, but
    only modify it later on.
    
    Fixes: 41977e86 ("rt2x00: add support for MT7620")
    Reported-by: default avatarwbob <wbob@jify.de>
    Reported-by: default avatarRoman Yeryomin <roman@advem.lv>
    Signed-off-by: default avatarDaniel Golle <daniel@makrotopia.org>
    Acked-by: default avatarStanislaw Gruszka <sgruszka@redhat.com>
    Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
    a1f7c2ca
rt2800lib.c 325 KB