diff options
| author | Steven Laver <lavers@google.com> | 2020-04-14 05:53:26 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2020-04-14 05:53:26 +0000 |
| commit | d9f287a3f37aae38c47f76e18b6f9d0d300c9247 (patch) | |
| tree | 6f7d19789eacdc16552267369b802e51695f024a /adb/daemon/usb_ffs.cpp | |
| parent | 77c0441b6aa52bafb75db1d8b8721c4836146ffb (diff) | |
| parent | 886ca3538d0f8b4e65f64ed65fc83e88db477d85 (diff) | |
Merge "Merge RP1A.200409.001" into r-keystone-qcom-dev
Diffstat (limited to 'adb/daemon/usb_ffs.cpp')
| -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 7bd611b663..e538ca8855 100644 --- a/adb/daemon/usb_ffs.cpp +++ b/adb/daemon/usb_ffs.cpp @@ -300,7 +300,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)); @@ -315,6 +314,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; |