linux: Fixup init_count tracking on hotplug init error

Signed-off-by: Hans de Goede <hdegoede@redhat.com>

diff --git a/libusb/os/linux_usbfs.c b/libusb/os/linux_usbfs.c
index 794b3a73539c23cc38f6e99a9198db057f380b6b..cdafb7b89ec89dc6504a3e8c29dbff994dd1dc10 100644 (file)
--- a/libusb/os/linux_usbfs.c
+++ b/libusb/os/linux_usbfs.c
@@ -436,15 +436,18 @@ static int op_init(struct libusb_context *ctx)
 
        usbi_mutex_static_lock(&hotplug_lock);
        r = LIBUSB_SUCCESS;
-       if (!init_count++) {
+       if (init_count == 0) {
                /* start up hotplug event handler */
                r = linux_start_event_monitor();
-               if (LIBUSB_SUCCESS != r) {
-                       usbi_err(ctx, "error starting hotplug event monitor");
-               }
        }
-       if (r == LIBUSB_SUCCESS)
+       if (r == LIBUSB_SUCCESS) {
                r = linux_scan_devices(ctx);
+               if (r == LIBUSB_SUCCESS)
+                       init_count++;
+               else
+                       linux_stop_event_monitor();
+       } else
+               usbi_err(ctx, "error starting hotplug event monitor");
        usbi_mutex_static_unlock(&hotplug_lock);
 
        return r;

diff --git a/libusb/version_nano.h b/libusb/version_nano.h
index 7391d652dffc09788c99e2c4bf68e9f563df1240..3db6b73a3fd4607539512242545bd37c58c234a0 100644 (file)
--- a/libusb/version_nano.h
+++ b/libusb/version_nano.h
@@ -1 +1 @@
-#define LIBUSB_NANO 10688
+#define LIBUSB_NANO 10689