diff --git a/firmware/src/main.rs b/firmware/src/main.rs index 21c9b26..c1511d4 100644 --- a/firmware/src/main.rs +++ b/firmware/src/main.rs @@ -965,9 +965,13 @@ fn main() -> ! { // TODO: we should handle unexpected NODATA differently from 'Stopping' if NODATA_FLAG.swap(false, Ordering::AcqRel) { - match uac2.handler().state.load(Ordering::Acquire) { - AudioState::Stopping => uac2.handler().transition(AudioState::Stopped), - _ => uac2.handler().transition(AudioState::Stopped), + let audio = uac2.handler(); + audio.transition(AudioState::Stopped); + // The host is still streaming (alt setting 1) so no alt setting change will + // re-arm us; re-arm now so the DMA channel is re-initialised before more data + // arrives. + if audio.alt_setting == 1 { + audio.transition(AudioState::Armed); } }