diff options
| author | Dan Albert <danalbert@google.com> | 2019-06-24 16:30:43 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-06-24 16:30:43 -0700 |
| commit | 5dd50fdb9c9386371d3ebafacb04c0270a80d455 (patch) | |
| tree | 1bef90a0273e269fe793cd0bcc8a9a8601a76a88 | |
| parent | e651cb7d7b179655afbe9dc14f3693f968c22a77 (diff) | |
| parent | ba4684c2b2bc952748ebbe176b292a6d263e4dc8 (diff) | |
| download | system_core-5dd50fdb9c9386371d3ebafacb04c0270a80d455.tar.gz system_core-5dd50fdb9c9386371d3ebafacb04c0270a80d455.tar.bz2 system_core-5dd50fdb9c9386371d3ebafacb04c0270a80d455.zip | |
Revert "adb: daemon: Assign valid fd to usb_handle ep0 file descriptor"
am: ba4684c2b2
Change-Id: Idd32e4c28031b07cda09477b819d4bce0434b4fb
| -rw-r--r-- | adb/daemon/usb_ffs.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/adb/daemon/usb_ffs.cpp b/adb/daemon/usb_ffs.cpp index 954e53015..07b4ba898 100644 --- a/adb/daemon/usb_ffs.cpp +++ b/adb/daemon/usb_ffs.cpp @@ -257,7 +257,6 @@ bool open_functionfs(android::base::unique_fd* out_control, android::base::uniqu } // Signal only when writing the descriptors to ffs android::base::SetProperty("sys.usb.ffs.ready", "1"); - *out_control = std::move(control); } bulk_out.reset(adb_open(USB_FFS_ADB_OUT, O_RDONLY)); @@ -272,6 +271,7 @@ bool open_functionfs(android::base::unique_fd* out_control, android::base::uniqu return false; } + *out_control = std::move(control); *out_bulk_in = std::move(bulk_in); *out_bulk_out = std::move(bulk_out); return true; |