diff options
| author | Dan Albert <danalbert@google.com> | 2019-06-24 14:36:01 -0700 |
|---|---|---|
| committer | Dan Albert <danalbert@google.com> | 2019-06-24 14:36:43 -0700 |
| commit | ba4684c2b2bc952748ebbe176b292a6d263e4dc8 (patch) | |
| tree | 26dfcf1e21ecb3d55f39ba0960b6d5cb17a3e506 | |
| parent | 2547f740ea132d8fcf26dd02ae5cc58e13c50a33 (diff) | |
| download | core-ba4684c2b2bc952748ebbe176b292a6d263e4dc8.tar.gz | |
Revert "adb: daemon: Assign valid fd to usb_handle ep0 file descriptor"
This reverts commit b2d79c5e48684d3859481bcca0e967fc4021db12.
Bug: http://b/135753060
Test: treehugger
Change-Id: I2b1b2b7dfb7bab783e4ed40e295329525ceaa0dd
| -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; |