openwrt/flashrom
1
0
Fork 0
mirror of https://review.coreboot.org/flashrom.git synced 2025-11-04 07:00:39 +01:00
Code Issues Releases Wiki Activity

stlinkv3_spi.c: Clean up properly on all init error paths

Browse Source 
If register_spi_master() fails, going to init exit cleanup is not
needed because at that point shutdown function has already been
registered and it does the job.

BUG=b:185191942
TEST=builds

Change-Id: I9fabf48068635593bc86006c9642d8569eee8447
Signed-off-by: Anastasia Klimchuk <aklm@chromium.org>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/54190
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Edward O'Callaghan <quasisec@chromium.org>
Reviewed-by: Miklós Márton <martonmiklosqdev@gmail.com>
This commit is contained in:
Anastasia Klimchuk
2021-05-14 14:01:34 +10:00
committed by Edward O'Callaghan
parent fbc38c7158
commit cee470ecef
1 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
stlinkv3_spi.c
View File

@@ -464,6 +464,7 @@ int stlinkv3_spi_init(void)
char *speed_str = NULL;
char *serialno = NULL;
char *endptr = NULL;
int ret = 1;
libusb_init(&usb_ctx);
if (!usb_ctx) {
@@ -485,7 +486,7 @@ int stlinkv3_spi_init(void)
else
msg_perr("Could not find any connected STLINK-V3\n");
free(serialno);
goto err_exit;
goto init_err_exit;
}
free(serialno);
@@ -498,23 +499,30 @@ int stlinkv3_spi_init(void)
msg_perr("Please pass the parameter "
"with a simple non-zero number in kHz\n");
free(speed_str);
return -1;
ret = -1;
goto init_err_exit;
}
free(speed_str);
}
if (stlinkv3_spi_open(sck_freq_kHz))
goto err_exit;
goto init_err_exit;
if (register_shutdown(stlinkv3_spi_shutdown, NULL))
goto err_exit;
goto init_err_cleanup_exit;
if (register_spi_master(&spi_programmer_stlinkv3, NULL))
goto err_exit;
return 1; /* shutdown function does cleanup */
return 0;
err_exit:
libusb_exit(usb_ctx);
init_err_cleanup_exit:
stlinkv3_spi_shutdown(NULL);
return 1;
init_err_exit:
if (stlinkv3_handle)
libusb_close(stlinkv3_handle);
libusb_exit(usb_ctx);
return ret;
}