commit fc4b4e34653375d02bef1be44d0702d054f4de3a
author Treehugger Robot <treehugger-gerrit@google.com> Wed May 31 02:03:40 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed May 31 02:03:42 2017 +0000
tree ebdb4f8b79a3ee366e65fd169139368b35bbc427
parent 2382b44b44086e07a7dccdc32d43df4252bae636
parent 9cb98e19a586b33b785031109090eb5e1dd98df0

Merge "adb: fix deadlock."

client/usb_libusb.cpp

diff --git a/client/usb_libusb.cpp b/client/usb_libusb.cpp
index fc32469..9477c56 100644
--- a/client/usb_libusb.cpp
+++ b/client/usb_libusb.cpp
@@ -427,11 +427,15 @@
 
 static int hotplug_callback(libusb_context*, libusb_device* device, libusb_hotplug_event event,
                             void*) {
-    if (event == LIBUSB_HOTPLUG_EVENT_DEVICE_ARRIVED) {
-        device_connected(device);
-    } else if (event == LIBUSB_HOTPLUG_EVENT_DEVICE_LEFT) {
-        device_disconnected(device);
-    }
+    // We're called with the libusb lock taken. Call these on the main thread outside of this
+    // function so that the usb_handle mutex is always taken before the libusb mutex.
+    fdevent_run_on_main_thread([device, event]() {
+        if (event == LIBUSB_HOTPLUG_EVENT_DEVICE_ARRIVED) {
+            device_connected(device);
+        } else if (event == LIBUSB_HOTPLUG_EVENT_DEVICE_LEFT) {
+            device_disconnected(device);
+        }
+    });
     return 0;
 }