diff options
| author | Edward Hill <ecgh@chromium.org> | 2020-08-14 15:33:09 -0600 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-08-15 01:47:31 +0000 |
| commit | 55554e281b65e4ca780bc1dfee28c2599e781efc (patch) | |
| tree | a11b86da0b53206af0a6e98e3adffc340a764929 /power | |
| parent | 29ad5a3e08fef053ffe8d56d004d868a8794481a (diff) | |
| download | chrome-ec-55554e281b65e4ca780bc1dfee28c2599e781efc.tar.gz | |
task: Change mutex_lock() assert
Instead of asserting that task_start() has not been called,
just return without doing any locking.
This avoids the need to fix every caller of mutex_lock() to check
task_start_called().
BUG=b:164461158
BRANCH=none
TEST=Esc+F3+Power enters recovery, does not assert.
Signed-off-by: Edward Hill <ecgh@chromium.org>
Change-Id: Ic157d7e7041185a67f257f0f5710fd02e45cd77f
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2357496
Reviewed-by: Wai-Hong Tam <waihong@google.com>
Tested-by: Wai-Hong Tam <waihong@google.com>
Commit-Queue: Wai-Hong Tam <waihong@google.com>
Diffstat (limited to 'power')
| -rw-r--r-- | power/common.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/power/common.c b/power/common.c index b3200fd186..0cdabca0fa 100644 --- a/power/common.c +++ b/power/common.c @@ -1049,15 +1049,10 @@ DECLARE_HOOK(HOOK_INIT, restore_enable_5v_state, HOOK_PRIO_FIRST); static void preserve_enable_5v_state(void) { - /* Must not call mutex_lock() before task_start(). */ - int use_mutex = task_start_called(); - - if (use_mutex) - mutex_lock(&pwr_5v_ctl_mtx); + mutex_lock(&pwr_5v_ctl_mtx); system_add_jump_tag(P5_SYSJUMP_TAG, 0, sizeof(pwr_5v_en_req), &pwr_5v_en_req); - if (use_mutex) - mutex_unlock(&pwr_5v_ctl_mtx); + mutex_unlock(&pwr_5v_ctl_mtx); } DECLARE_HOOK(HOOK_SYSJUMP, preserve_enable_5v_state, HOOK_PRIO_DEFAULT); #endif /* defined(CONFIG_POWER_PP5000_CONTROL) */ |