From d439956cb2ce5222fa8cfaa7992a90f4cef98eae Mon Sep 17 00:00:00 2001 From: Rogier Wolff Date: Sat, 21 Mar 2020 17:34:54 +0100 Subject: [PATCH] now return error in probe when things go bad. --- src/usb.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/usb.c b/src/usb.c index 9df9d7296..8c932e71e 100644 --- a/src/usb.c +++ b/src/usb.c @@ -1069,15 +1069,17 @@ stlink_t *stlink_open_usb(enum ugly_loglevel verbose, bool reset, char serial[ST } ret = stlink_load_device_params(sl); - -on_libusb_error: if (ret == -1) { - stlink_close(sl); - return NULL; + // This one didn't have any message. + goto on_libusb_error; } - return sl; +on_libusb_error: + stlink_close(sl); + return NULL; + + on_error: if (slu->libusb_ctx) libusb_exit(slu->libusb_ctx);