usb: fix enumeration issues by propagating buffer overflow error.

atsamd-rs · Jun 6, 2024 · c324f30 · c324f30
1 parent dda58d6
commit c324f30
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/hal/CHANGELOG.md b/hal/CHANGELOG.md
@@ -1,5 +1,6 @@
 # Unreleased Changes
 
+- Fix USB enumeration issues with fast host controllers
 - Allow configuring USB clock with `GenericClockController` on atsamd11
 - fix samd51j not having i2s support
 - remove i2s functionality for samd51g since it does not have it

diff --git a/hal/src/peripherals/usb/d11/bus.rs b/hal/src/peripherals/usb/d11/bus.rs
@@ -898,7 +898,7 @@ impl Inner {
         let rxstp = bank.received_setup_interrupt();
 
         if bank.is_ready() || rxstp {
-            let size = bank.read(buf);
+            let size = bank.read(buf)?;
 
             if rxstp {
                 bank.clear_received_setup_interrupt();
@@ -907,7 +907,7 @@ impl Inner {
             bank.clear_transfer_complete();
             bank.set_ready(false);
 
-            size
+            Ok(size)
         } else {
             Err(UsbError::WouldBlock)
         }

diff --git a/hal/src/peripherals/usb/d5x/bus.rs b/hal/src/peripherals/usb/d5x/bus.rs
@@ -841,7 +841,7 @@ impl Inner {
         let rxstp = bank.received_setup_interrupt();
 
         if bank.is_ready() || rxstp {
-            let size = bank.read(buf);
+            let size = bank.read(buf)?;
 
             if rxstp {
                 bank.clear_received_setup_interrupt();
@@ -850,7 +850,7 @@ impl Inner {
             bank.clear_transfer_complete();
             bank.set_ready(false);
 
-            size
+            Ok(size)
         } else {
             Err(UsbError::WouldBlock)
         }