lkml.org 
[lkml]   [2020]   [Feb]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.5 132/542] mt76: mt7615: fix max_nss in mt7615_eeprom_parse_hw_cap
    Date
    From: Lorenzo Bianconi <lorenzo@kernel.org>

    [ Upstream commit d08f3010f4a32eec3c8aa771f03a1b342a1472fa ]

    Fix u8 cast reading max_nss from MT_TOP_STRAP_STA register in
    mt7615_eeprom_parse_hw_cap routine

    Fixes: acf5457fd99db ("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: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/wireless/mediatek/mt76/mt7615/eeprom.c | 3 ++-
    1 file changed, 2 insertions(+), 1 deletion(-)

    diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/eeprom.c b/drivers/net/wireless/mediatek/mt76/mt7615/eeprom.c
    index eccad4987ac83..17e277bf39e0f 100644
    --- 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]);
    --
    2.20.1
    \
     
     \ /
      Last update: 2020-02-14 19:16    [W:4.610 / U:0.096 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site