From 06bcc26b1da37e979e14a974274724eeb9622185 Mon Sep 17 00:00:00 2001 From: Alexander Goncharov Date: Tue, 24 Jan 2023 14:43:12 +0400 Subject: dummyflasher: fix propagation of register_*_master() return values This patch checks return value of register_*_master() so that in case of an error this error is not ignored anymore. TEST=ninja test Change-Id: I3a7eeb3cdd814db18b0717ae8b40ecadb4c32f7c Signed-off-by: Alexander Goncharov Reviewed-on: https://review.coreboot.org/c/flashrom/+/72430 Tested-by: build bot (Jenkins) Reviewed-by: Anastasia Klimchuk --- dummyflasher.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/dummyflasher.c b/dummyflasher.c index 1960e92ef..93f183aab 100644 --- a/dummyflasher.c +++ b/dummyflasher.c @@ -1345,6 +1345,7 @@ static int init_data(const struct programmer_cfg *cfg, static int dummy_init(const struct programmer_cfg *cfg) { + int ret = 0; struct stat image_stat; struct emu_data *data = calloc(1, sizeof(*data)); @@ -1410,15 +1411,15 @@ dummy_init_out: } if (dummy_buses_supported & BUS_PROG) - register_opaque_master(&opaque_master_dummyflasher, data); + ret |= register_opaque_master(&opaque_master_dummyflasher, data); if (dummy_buses_supported & BUS_NONSPI) - register_par_master(&par_master_dummyflasher, - dummy_buses_supported & BUS_NONSPI, - data); + ret |= register_par_master(&par_master_dummyflasher, + dummy_buses_supported & BUS_NONSPI, + data); if (dummy_buses_supported & BUS_SPI) - register_spi_master(&spi_master_dummyflasher, data); + ret |= register_spi_master(&spi_master_dummyflasher, data); - return 0; + return ret; } const struct programmer_entry programmer_dummy = { -- cgit v1.2.3