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;