diff options
| author | Mary Ruthven <mruthven@chromium.org> | 2019-04-01 11:22:36 -0700 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2019-04-03 18:14:05 -0700 |
| commit | 23a89eccf3143790b89867fd32ad8331e53d49c0 (patch) | |
| tree | a477cc76352741e5f941b9671a978f46d08bf27e | |
| parent | 77af7f0ad210a9c1eef47ecaf0151c6df2054e94 (diff) | |
| download | chrome-ec-23a89eccf3143790b89867fd32ad8331e53d49c0.tar.gz | |
factory_mode: change how reset_required is saved
Logically OR reset_required with the saved reset_required state when
enabling factory mode, so there is no way to cancel a reset once it's
requested.
BUG=none
BRANCH=cr50
TEST=enable factory mode.
Change-Id: I7a432989b83946570a914f27e806ec2dbc9e9791
Signed-off-by: Mary Ruthven <mruthven@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/1548273
Commit-Ready: ChromeOS CL Exonerator Bot <chromiumos-cl-exonerator@appspot.gserviceaccount.com>
Reviewed-by: Vadim Bendebury <vbendeb@chromium.org>
| -rw-r--r-- | common/factory_mode.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/common/factory_mode.c b/common/factory_mode.c index c497a212fe..1555fc6833 100644 --- a/common/factory_mode.c +++ b/common/factory_mode.c @@ -116,7 +116,7 @@ void enable_ccd_factory_mode(int reset_required) { delay_sleep_by(DISABLE_SLEEP_TIME); - reset_required_ = !!reset_required; + reset_required_ |= !!reset_required; hook_call_deferred(&factory_enable_deferred_data, TPM_PROCESSING_TIME); } |