From b1a7c7ebf110aece7175b0c4d032608a00a7b55b Mon Sep 17 00:00:00 2001 From: Frederik Carlier Date: Wed, 20 Jan 2021 10:39:35 +0100 Subject: Don't call libusb_set_option if libusb_init fails --- src/usb.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/usb.c b/src/usb.c index e334707..abc4a2b 100644 --- a/src/usb.c +++ b/src/usb.c @@ -827,17 +827,17 @@ int usb_init(void) device_polling = 1; res = libusb_init(NULL); + if (res != 0) { + usbmuxd_log(LL_FATAL, "libusb_init failed: %s", libusb_error_name(res)); + return -1; + } + #if LIBUSB_API_VERSION >= 0x01000106 libusb_set_option(NULL, LIBUSB_OPTION_LOG_LEVEL, (log_level >= LL_DEBUG ? LIBUSB_LOG_LEVEL_DEBUG: (log_level >= LL_WARNING ? LIBUSB_LOG_LEVEL_WARNING: LIBUSB_LOG_LEVEL_NONE))); #else libusb_set_debug(NULL, (log_level >= LL_DEBUG ? LIBUSB_LOG_LEVEL_DEBUG: (log_level >= LL_WARNING ? LIBUSB_LOG_LEVEL_WARNING: LIBUSB_LOG_LEVEL_NONE))); #endif - if(res != 0) { - usbmuxd_log(LL_FATAL, "libusb_init failed: %s", libusb_error_name(res)); - return -1; - } - collection_init(&device_list); #ifdef HAVE_LIBUSB_HOTPLUG_API -- cgit v1.1-32-gdbae