diff options
| author |   Sean Wang <sean.wang@mediatek.com> | 2021-12-16 05:25:36 +0800 |
|---|---|---|
| committer |   Felix Fietkau <nbd@nbd.name> | 2021-12-19 15:24:04 +0100 |
| commit | 3fb47c883806e97499365506c6c57f3b4907bf1e (patch) | |
| tree | dccf1198c4886696cc88156ee1bd796eacea9b78 | |
| parent | mt76: mt7921: fix possible resume failure (diff) | |
| download | linux-dev-3fb47c883806e97499365506c6c57f3b4907bf1e.tar.xz linux-dev-3fb47c883806e97499365506c6c57f3b4907bf1e.zip | |
mt76: mt7921s: make pm->suspended usage consistent
Update pm->suspended usage to be consistent with mt7921e driver.
Signed-off-by: Sean Wang <sean.wang@mediatek.com>
Signed-off-by: Felix Fietkau <nbd@nbd.name>
| -rw-r--r-- | drivers/net/wireless/mediatek/mt76/mt7921/sdio.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/sdio.c b/drivers/net/wireless/mediatek/mt76/mt7921/sdio.c index 84be229a899d..65d693902c22 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7921/sdio.c +++ b/drivers/net/wireless/mediatek/mt76/mt7921/sdio.c @@ -278,7 +278,6 @@ static int mt7921s_resume(struct device *__dev) struct mt76_dev *mdev = &dev->mt76; int err; - pm->suspended = false; clear_bit(MT76_STATE_SUSPEND, &mdev->phy.state); err = mt7921_mcu_drv_pmctrl(dev); @@ -294,7 +293,13 @@ static int mt7921s_resume(struct device *__dev) if (!pm->ds_enable) mt76_connac_mcu_set_deep_sleep(mdev, false); - return mt76_connac_mcu_set_hif_suspend(mdev, false); + err = mt76_connac_mcu_set_hif_suspend(mdev, false); + if (err) + return err; + + pm->suspended = false; + + return err; } static const struct dev_pm_ops mt7921s_pm_ops = { |