linux_usbfs: Fix exit crash on Android

In commit "89b810ec Android: Add option LIBUSB_OPTION_WEAK_AUTHORITY
to support used in apk", we should also check weak_authority when
exiting the backend.

[dickens] Fixed whitespace

Closes #842

Signed-off-by: Mark Kuo <starryalley@gmail.com>
Signed-off-by: Chris Dickens <christopher.a.dickens@gmail.com>

diff --git a/libusb/os/linux_usbfs.c b/libusb/os/linux_usbfs.c
index 7175b354905af785793bc034cef5b609f1799d9d..4882c0f6369067ab14885403896642b2961fd602 100644 (file)
--- a/libusb/os/linux_usbfs.c
+++ b/libusb/os/linux_usbfs.c
@@ -415,6 +415,13 @@ static int op_init(struct libusb_context *ctx)
 static void op_exit(struct libusb_context *ctx)
 {
        UNUSED(ctx);
+
+#ifdef __ANDROID__
+       if (weak_authority) {
+               return;
+       }
+#endif
+
        usbi_mutex_static_lock(&linux_hotplug_startstop_lock);
        assert(init_count != 0);
        if (!--init_count) {

diff --git a/libusb/version_nano.h b/libusb/version_nano.h
index b74033d04c351ee3f9ec6e3df5d2450dbdf1770f..e7da9f6cc7a7d3774eca40ec3abb6d375ba1cf03 100644 (file)
--- a/libusb/version_nano.h
+++ b/libusb/version_nano.h
@@ -1 +1 @@
-#define LIBUSB_NANO 11596
+#define LIBUSB_NANO 11597