commit adf07c54283b1561c14ed908c86a31ce316343e7
author Treehugger Robot <treehugger-gerrit@google.com> Wed May 16 23:25:15 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed May 16 23:25:15 2018 +0000
tree d5142b57bb4056ef7b379f6c8f3938840b68496c
parent e619ebc151b6ffc52d9920488d1da218142b0b62
parent d8c1ae910f70124cccd82670d70f27af7a0c6644

Merge "adb: Move io_setup to usb_handle init"

adb/daemon/usb.cpp

diff --git a/adb/daemon/usb.cpp b/adb/daemon/usb.cpp
index ab11bdd..fbf7276 100644
--- a/adb/daemon/usb.cpp
+++ b/adb/daemon/usb.cpp
@@ -234,6 +234,10 @@
     for (unsigned i = 0; i < USB_FFS_NUM_BUFS; i++) {
         aiob->iocbs[i] = &aiob->iocb[i];
     }
+    memset(&aiob->ctx, 0, sizeof(aiob->ctx));
+    if (io_setup(USB_FFS_NUM_BUFS, &aiob->ctx)) {
+        D("[ aio: got error on io_setup (%d) ]", errno);
+    }
 }
 
 static int getMaxPacketSize(int ffs_fd) {
@@ -312,13 +316,6 @@
         goto err;
     }
 
-    memset(&h->read_aiob.ctx, 0, sizeof(h->read_aiob.ctx));
-    memset(&h->write_aiob.ctx, 0, sizeof(h->write_aiob.ctx));
-    if (io_setup(USB_FFS_NUM_BUFS, &h->read_aiob.ctx) ||
-        io_setup(USB_FFS_NUM_BUFS, &h->write_aiob.ctx)) {
-        D("[ aio: got error on io_setup (%d) ]", errno);
-    }
-
     h->read_aiob.fd = h->bulk_out;
     h->write_aiob.fd = h->bulk_in;
     return true;
@@ -494,8 +491,6 @@
     h->kicked = false;
     adb_close(h->bulk_out);
     adb_close(h->bulk_in);
-    io_destroy(h->read_aiob.ctx);
-    io_destroy(h->write_aiob.ctx);
 
     // Notify usb_adb_open_thread to open a new connection.
     h->lock.lock();