UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

mt76: connac: unschedule ps_work in mt76_connac_pm_wake 

In order to avoid synchronization issues between wake and ps works,
cancel ps_work in mt76_connac_pm_wake routine

Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: Felix Fietkau <nbd@nbd.name>
This commit is contained in:
Lorenzo Bianconi 2021-04-18 18:45:35 +02:00 committed by Felix Fietkau
parent db928f1ab9
commit 4f9b3aeb83
3 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/net/wireless/mediatek/mt76/mt7615/mcu.c
View File

@ -345,7 +345,6 @@ static int mt7615_mcu_lp_drv_pmctrl(struct mt7615_dev *dev)
clear_bit(MT76_STATE_PM, &mphy->state);
out:
dev->pm.last_activity = jiffies;
mutex_unlock(&dev->pm.mutex);
return err;

1
drivers/net/wireless/mediatek/mt76/mt76_connac_mac.c
View File

@ -13,6 +13,7 @@ int mt76_connac_pm_wake(struct mt76_phy *phy, struct mt76_connac_pm *pm)
if (!mt76_is_mmio(dev))
return 0;
cancel_delayed_work_sync(&pm->ps_work);
if (!test_bit(MT76_STATE_PM, &phy->state))
return 0;

1
drivers/net/wireless/mediatek/mt76/mt7921/mcu.c
View File

@ -1289,7 +1289,6 @@ int mt7921_mcu_drv_pmctrl(struct mt7921_dev *dev)
clear_bit(MT76_STATE_PM, &mphy->state);
out:
dev->pm.last_activity = jiffies;
mutex_unlock(&dev->pm.mutex);
if (err)