openwrt/flashrom
1
0
Fork 0
mirror of https://review.coreboot.org/flashrom.git synced 2025-04-27 23:22:37 +02:00
Code Issues Releases Wiki Activity

dediprog.c: Split up compound conditional and swap two operations

Browse Source 
register_spi_master now becomes the last operation in init function,
which is consistent with other spi masters.

In addition, the patch fixes propagation of register_spi_master return
values, which is also consistent with other spi masters.

TEST=ninja test

Change-Id: Ib7e0179da39279e32a8497466b044b69ec836da8
Signed-off-by: Angel Pons <th3fanbus@gmail.com>
Signed-off-by: Anastasia Klimchuk <aklm@chromium.org>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/51706
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Nico Huber <nico.h@gmx.de>
This commit is contained in:
Angel Pons 2021-03-22 11:28:00 +01:00 committed by Nico Huber
parent a16f6a5497
commit 1e2a5d8d8d
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dediprog.c
View File

@ -1300,10 +1300,10 @@ static int dediprog_init(void)
if (protocol(dp_data) >= PROTOCOL_V2) if (protocol(dp_data) >= PROTOCOL_V2)
spi_master_dediprog.features |= SPI_MASTER_4BA; spi_master_dediprog.features |= SPI_MASTER_4BA;
if (register_spi_master(&spi_master_dediprog, dp_data) || dediprog_set_leds(LED_NONE, dp_data)) if (dediprog_set_leds(LED_NONE, dp_data))
return 1; /* shutdown function does cleanup */ goto init_err_cleanup_exit;
return 0; return register_spi_master(&spi_master_dediprog, dp_data);
init_err_cleanup_exit: init_err_cleanup_exit:
dediprog_shutdown(dp_data); dediprog_shutdown(dp_data);