diff --git a/dediprog.c b/dediprog.c
index 2d266d4..e18356b 100644
--- a/dediprog.c
+++ b/dediprog.c
@@ -1205,8 +1205,8 @@
 	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 5a9c08d..d15cc7a 100644
--- a/developerbox_spi.c
+++ b/developerbox_spi.c
@@ -138,8 +138,7 @@
 
 static int developerbox_spi_init(void)
 {
-	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 2d3ce22..68790cf 100644
--- a/stlinkv3_spi.c
+++ b/stlinkv3_spi.c
@@ -456,8 +456,7 @@
 	int ret = 1;
 	int devIndex = 0;
 
-	libusb_init(&usb_ctx);
-	if (!usb_ctx) {
+	if (libusb_init(&usb_ctx)) {
 		msg_perr("Could not initialize libusb!\n");
 		return 1;
 	}