commit ceee7c3b5cef78972f6d8adc7953b71a5c7d8627
author Matthew Maurer <mmaurer@google.com> Fri Dec 08 18:55:27 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Dec 08 18:55:27 2023 +0000
tree 7acfdd154faea613faf03b38fd45a82b5767abee
parent 5f789249661bf1490d6c1e281b2551f947027ed9
parent b1e0c41c066328c3c3a4fcf6c3a587fc7b80ae32

Merge "Fix for nix 0.27.1." into main am: be8bf80c56 am: b1e0c41c06

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2859925

Change-Id: I3ae646e0e3e8851e1d6a4fcccb9ad42a0f48173e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

uwb/aidl/default/src/uwb_chip.rs

diff --git a/uwb/aidl/default/src/uwb_chip.rs b/uwb/aidl/default/src/uwb_chip.rs
index 2b8e481..efb2454 100644
--- a/uwb/aidl/default/src/uwb_chip.rs
+++ b/uwb/aidl/default/src/uwb_chip.rs
@@ -14,7 +14,6 @@
 
 use std::fs::{File, OpenOptions};
 use std::io::{self, Read, Write};
-use std::os::fd::AsRawFd;
 use std::os::unix::fs::OpenOptionsExt;
 
 enum State {
@@ -61,13 +60,11 @@
 }
 
 pub fn makeraw(file: File) -> io::Result<File> {
-    let fd = file.as_raw_fd();
-
-    // Configure the file descritpro as raw fd.
+    // Configure the file descriptor as raw fd.
     use nix::sys::termios::*;
-    let mut attrs = tcgetattr(fd)?;
+    let mut attrs = tcgetattr(&file)?;
     cfmakeraw(&mut attrs);
-    tcsetattr(fd, SetArg::TCSANOW, &attrs)?;
+    tcsetattr(&file, SetArg::TCSANOW, &attrs)?;
 
     Ok(file)
 }