diff --git a/dediprog.c b/dediprog.c index 519a8b0d6..e5bf84e39 100644 --- a/dediprog.c +++ b/dediprog.c @@ -1206,8 +1206,8 @@ static int dediprog_init(void) dp_data->devicetype = DEV_UNKNOWN; /* Here comes the USB stuff. */ - libusb_init(&dp_data->usb_ctx); - if (!dp_data->usb_ctx) { + ret = libusb_init(&dp_data->usb_ctx); + if (ret) { msg_perr("Could not initialize libusb!\n"); goto init_err_exit; } diff --git a/developerbox_spi.c b/developerbox_spi.c index c84190a38..6308da630 100644 --- a/developerbox_spi.c +++ b/developerbox_spi.c @@ -147,8 +147,7 @@ static int developerbox_spi_init(void) struct libusb_context *usb_ctx; libusb_device_handle *cp210x_handle; - libusb_init(&usb_ctx); - if (!usb_ctx) { + if (libusb_init(&usb_ctx)) { msg_perr("Could not initialize libusb!\n"); return 1; } diff --git a/stlinkv3_spi.c b/stlinkv3_spi.c index 4919d48a3..22a0a0634 100644 --- a/stlinkv3_spi.c +++ b/stlinkv3_spi.c @@ -485,8 +485,7 @@ static int stlinkv3_spi_init(void) libusb_device_handle *stlinkv3_handle; struct stlinkv3_spi_data *stlinkv3_data; - libusb_init(&usb_ctx); - if (!usb_ctx) { + if (libusb_init(&usb_ctx)) { msg_perr("Could not initialize libusb!\n"); return 1; }