commit 7f8fb3ffa2a234b704fc975fc9b1001f17df9cac
author Benoit Goby <benoit@android.com> Tue Apr 02 01:44:49 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Apr 02 01:44:50 2013 +0000
tree 68f79a8ebb680d99c7618c27507874e48cb0028e
parent ded2e5acfcf0c705f08577d0ccb720bd5037f4ba
parent b66356cab6cd47ecbe26513f36614dda1052eb11

Merge "adb: Prevent registering usb_disconnect twice" into jb-mr2-dev

adb/adb_auth_client.c

diff --git a/adb/adb_auth_client.c b/adb/adb_auth_client.c
index efc49eb..763b448 100644
--- a/adb/adb_auth_client.c
+++ b/adb/adb_auth_client.c
@@ -161,7 +161,7 @@
 
 static void usb_disconnected(void* unused, atransport* t)
 {
-    D("USB disconnect");
+    D("USB disconnect\n");
     remove_transport_disconnect(usb_transport, &usb_disconnect);
     usb_transport = NULL;
     needs_retry = false;
@@ -175,7 +175,7 @@
     if (events & FDE_READ) {
         ret = unix_read(fd, response, sizeof(response));
         if (ret < 0) {
-            D("Framework disconnect");
+            D("Framework disconnect\n");
             if (usb_transport)
                 fdevent_remove(&usb_transport->auth_fde);
             framework_fd = -1;
@@ -192,8 +192,10 @@
     char msg[MAX_PAYLOAD];
     int ret;
 
-    usb_transport = t;
-    add_transport_disconnect(t, &usb_disconnect);
+    if (!usb_transport) {
+        usb_transport = t;
+        add_transport_disconnect(t, &usb_disconnect);
+    }
 
     if (framework_fd < 0) {
         D("Client not connected\n");