termux-packages/packages/libusb/weak_authority.patch

36 lines
993 B
Diff
Raw Normal View History

commit e78cafbaa2692f5b6e8e8f0ff306f5826c5dd94d
Author: Mark Kuo <starryalley@gmail.com>
Date: Sun Jan 10 16:58:26 2021 +1100
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 7175b35..4882c0f 100644
--- 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) {