!839 fix: 修复内核低功耗模式调整后同步问题

Merge pull request !839 from zhushengle/cherry-pick-1664191999
fixed 5bae8b5 from https://gitee.com/zhushengle/kernel_liteos_m/pulls/831
2022-09-28 07:22:34 +00:00 · 2022-09-26 11:33:23 +00:00 · 2022-09-25 08:30:56 +00:00 · 2022-09-22 06:11:42 +00:00
1 changed files with 2 additions and 1 deletions
--- a/components/power/los_pm.c
+++ b/components/power/los_pm.c
@@ -130,7 +130,7 @@ STATIC BOOL OsPmTickTimerStop(LosPmCB *pm)
    LosPmTickTimer *tickTimer = pm->tickTimer;

    if ((tickTimer == NULL) || (tickTimer->tickLock == NULL) ||
-        (pm->pmMode == LOS_SYS_NORMAL_SLEEP)) {
+        (pm->sysMode == LOS_SYS_NORMAL_SLEEP)) {
        return FALSE;
    }

@@ -264,6 +264,7 @@ STATIC UINT32 OsPmSuspendSleep(LosPmCB *pm)

    if (pm->sysctrl->suspendCheck != NULL) {
        pm->sysctrl->suspendCheck(mode);
+        pm->sysMode = pm->pmMode;
    }

    tickTimerStop = OsPmTickTimerStop(pm);
Author	SHA1	Message	Date
openharmony_ci	06631fce7d	!839 fix: 修复内核低功耗模式调整后同步问题 Merge pull request !839 from zhushengle/cherry-pick-1664191999	2022-09-28 07:22:34 +00:00
zhushengle	6d3a950a21	fixed `5bae8b5` from https://gitee.com/zhushengle/kernel_liteos_m/pulls/831 fix: 修复内核低功耗模式调整后同步问题 Close #I5SNYA Signed-off-by: zhushengle <zhushengle@huawei.com> Change-Id: I4df212bbf3e522ea371b5340848ba5adf2668ad7	2022-09-26 11:33:23 +00:00
openharmony_ci	798fbd0212	!837 同步清除内核告警信息 Merge pull request !837 from 夏不白/cherry-pick-1664026693	2022-09-25 08:30:56 +00:00
openharmony_ci	1a66fa3daf	!829 Fix : 内核告警清理挑单 Merge pull request !829 from yinjiaming/cherry-pick-1663655884	2022-09-22 06:11:42 +00:00