Merge pull request tock#4320 from tock/spi-controller-buffer-length

capsules: spi controller: set rlen length
YoeDistro · Jan 30, 2025 · 83e3fc1 · 83e3fc1
2 parents 515484f + a4abec1
commit 83e3fc1
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/capsules/core/src/spi_controller.rs b/capsules/core/src/spi_controller.rs
@@ -186,8 +186,12 @@ impl<'a, S: SpiMasterDevice<'a>> Spi<'a, S> {
                 .take()
                 .unwrap_or((&mut [] as &'static mut [u8]).into());
             kwbuf.slice(0..write_len);
-            self.spi_master
-                .read_write_bytes(kwbuf, self.kernel_read.take())
+            if let Some(mut krbuf) = self.kernel_read.take() {
+                krbuf.slice(0..rlen);
+                self.spi_master.read_write_bytes(kwbuf, Some(krbuf))
+            } else {
+                self.spi_master.read_write_bytes(kwbuf, None)
+            }
         };
     }
 }