diff options
author | Anastasia Klimchuk <aklm@chromium.org> | 2021-04-16 14:54:41 +1000 |
---|---|---|
committer | Nico Huber <nico.h@gmx.de> | 2021-04-18 23:14:05 +0000 |
commit | fbf3479c71ab5e800de71bffd3d0844b9588614f (patch) | |
tree | e1e8897b58fc4ce2e591645c7a164d0ff7d981cb /ene_lpc.c | |
parent | 75b4536085664c8e81882656dbed9e52558e61e4 (diff) | |
download | flashrom-fbf3479c71ab5e800de71bffd3d0844b9588614f.tar.gz flashrom-fbf3479c71ab5e800de71bffd3d0844b9588614f.tar.bz2 flashrom-fbf3479c71ab5e800de71bffd3d0844b9588614f.zip |
ene_lpc.c: Move register_shutdown to the end of initialisation
A bit more details: since register_shutdown has moved a few lines
below, now ene_enter_flash_mode is called before the shutdown function
is registered. ene_enter_flash_mode can fail (at least in theory,
it has some return 1s), but its return value is not analyzed, so even if
it returns non-0, execution goes further and register_shutdown will
happen anyway.
It is a separate question whether the return value of
ene_enter_flash_mode needs to be analyzed or is it ok to ignore it,
but in this patch I plan to keep the same behaviour, and probably I
will get back to error handling later.
This unlocks API change which plans to move register_shutdown inside
register master API, see https://review.coreboot.org/c/flashrom/+/51761
TEST=builds
BUG=b:185191942
Change-Id: If89a758c91c77486adbac2779449bcd71ab8fc78
Signed-off-by: Anastasia Klimchuk <aklm@chromium.org>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/52406
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-by: Nico Huber <nico.h@gmx.de>
Diffstat (limited to 'ene_lpc.c')
-rw-r--r-- | ene_lpc.c | 9 |
1 files changed, 4 insertions, 5 deletions
@@ -559,16 +559,15 @@ int ene_lpc_init() * Compal - ec_command(0x41, 0xa1) returns 43 4f 4d 50 41 4c 9c */ + ene_enter_flash_mode(ctx_data); + + internal_buses_supported |= BUS_LPC; + spi_master_ene.data = ctx_data; if (register_shutdown(ene_leave_flash_mode, ctx_data)) { ret = 1; goto ene_probe_spi_flash_exit; } - - ene_enter_flash_mode(ctx_data); - - internal_buses_supported |= BUS_LPC; - spi_master_ene.data = ctx_data; register_spi_master(&spi_master_ene); msg_pdbg("%s: successfully initialized ene\n", __func__); |