lkml.org 
[lkml]   [2022]   [Aug]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.19 0477/1157] mt76: mt7921: do not update pm states in case of error
    Date
    From: Lorenzo Bianconi <lorenzo@kernel.org>

    [ Upstream commit f4a92547fb9818ff272e1e2f0c79cd6b0bc99ce8 ]

    Do not update pm stats if mt7921e_mcu_fw_pmctrl routine returns an
    error.

    Fixes: 36873246f78a2 ("mt76: mt7921: add awake and doze time accounting")
    Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
    Signed-off-by: Felix Fietkau <nbd@nbd.name>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/wireless/mediatek/mt76/mt7921/pci_mcu.c | 6 +++---
    1 file changed, 3 insertions(+), 3 deletions(-)

    diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/pci_mcu.c b/drivers/net/wireless/mediatek/mt76/mt7921/pci_mcu.c
    index 36669e5aeef3..a1ab5f878f81 100644
    --- a/drivers/net/wireless/mediatek/mt76/mt7921/pci_mcu.c
    +++ b/drivers/net/wireless/mediatek/mt76/mt7921/pci_mcu.c
    @@ -102,7 +102,7 @@ int mt7921e_mcu_fw_pmctrl(struct mt7921_dev *dev)
    {
    struct mt76_phy *mphy = &dev->mt76.phy;
    struct mt76_connac_pm *pm = &dev->pm;
    - int i, err = 0;
    + int i;

    for (i = 0; i < MT7921_DRV_OWN_RETRY_COUNT; i++) {
    mt76_wr(dev, MT_CONN_ON_LPCTL, PCIE_LPCR_HOST_SET_OWN);
    @@ -114,12 +114,12 @@ int mt7921e_mcu_fw_pmctrl(struct mt7921_dev *dev)
    if (i == MT7921_DRV_OWN_RETRY_COUNT) {
    dev_err(dev->mt76.dev, "firmware own failed\n");
    clear_bit(MT76_STATE_PM, &mphy->state);
    - err = -EIO;
    + return -EIO;
    }

    pm->stats.last_doze_event = jiffies;
    pm->stats.awake_time += pm->stats.last_doze_event -
    pm->stats.last_wake_event;

    - return err;
    + return 0;
    }
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-08-16 01:57    [W:7.329 / U:0.016 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site