[flashrom-gerrit] Change in flashrom[master]: dediprog.c: Split up compound conditional and swap two operations

[Nico Huber (Code Review)]

Nico Huber has submitted this change. ( https://review.coreboot.org/c/flashrom/+/51706 )

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

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

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 
Signed-off-by: Anastasia Klimchuk 
Reviewed-on: https://review.coreboot.org/c/flashrom/+/51706
Tested-by: build bot (Jenkins) 
Reviewed-by: Nico Huber 
---
M dediprog.c
1 file changed, 3 insertions(+), 3 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Nico Huber: Looks good to me, approved
  Angel Pons: Looks good to me, but someone else must approve

diff --git a/dediprog.c b/dediprog.c
index a1d9972..85b78c8 100644
--- a/dediprog.c
+++ b/dediprog.c
@@ -1300,10 +1300,10 @@
    if (protocol(dp_data) >= PROTOCOL_V2)
    	spi_master_dediprog.features |= SPI_MASTER_4BA;

-	if (register_spi_master(&spi_master_dediprog, dp_data) || dediprog_set_leds(LED_NONE, dp_data))
-		return 1; /* shutdown function does cleanup */
+	if (dediprog_set_leds(LED_NONE, dp_data))
+		goto init_err_cleanup_exit;

-	return 0;
+	return register_spi_master(&spi_master_dediprog, dp_data);

init_err_cleanup_exit:
    dediprog_shutdown(dp_data);