commit 12405b3166d6c684a76770c183cbfb6a37b29f37
author Treehugger Robot <treehugger-gerrit@google.com> Thu May 02 21:09:04 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu May 02 21:09:04 2019 +0000
tree 5d88abab48e1b0150ed735791c79efdccbf8ff94
parent 94622690f65a3f5c168f29d4c79799b895b186b5
parent 2fe0b572a8b450a4fc8f666e95bc9eb39e062907

Merge "adbd: avoid starting multiple worker threads."

adb/daemon/usb.cpp

diff --git a/adb/daemon/usb.cpp b/adb/daemon/usb.cpp
index 1e37015..0a116ab 100644
--- a/adb/daemon/usb.cpp
+++ b/adb/daemon/usb.cpp
@@ -310,11 +310,13 @@
                         if (bound) {
                             LOG(WARNING) << "received FUNCTIONFS_BIND while already bound?";
                             running = false;
+                            break;
                         }
 
                         if (enabled) {
                             LOG(WARNING) << "received FUNCTIONFS_BIND while already enabled?";
                             running = false;
+                            break;
                         }
 
                         bound = true;
@@ -324,11 +326,13 @@
                         if (!bound) {
                             LOG(WARNING) << "received FUNCTIONFS_ENABLE while not bound?";
                             running = false;
+                            break;
                         }
 
                         if (enabled) {
                             LOG(WARNING) << "received FUNCTIONFS_ENABLE while already enabled?";
                             running = false;
+                            break;
                         }
 
                         enabled = true;