From 3fec3376a47dc95f3d9cc645d2f204a79cf451d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=C3=A1niel=20Buga?= <bugadani@gmail.com>
Date: Fri, 30 May 2025 10:06:17 +0200
Subject: [PATCH] Disable timer as part of preempt::disable (#3575)

---
 esp-wifi/src/lib.rs                 | 3 ---
 esp-wifi/src/preempt_builtin/mod.rs | 5 +++--
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/esp-wifi/src/lib.rs b/esp-wifi/src/lib.rs
index 94e9aa1a0..2b39f2663 100644
--- a/esp-wifi/src/lib.rs
+++ b/esp-wifi/src/lib.rs
@@ -460,9 +460,6 @@ pub unsafe fn deinit_unchecked() -> Result<(), InitializationError> {
 
     shutdown_radio_isr();
 
-    #[cfg(feature = "builtin-scheduler")]
-    preempt_builtin::disable_timer();
-
     // This shuts down the task switcher and timer tick interrupt.
     preempt::disable();
 
diff --git a/esp-wifi/src/preempt_builtin/mod.rs b/esp-wifi/src/preempt_builtin/mod.rs
index bc53196a9..8db2f1b9c 100644
--- a/esp-wifi/src/preempt_builtin/mod.rs
+++ b/esp-wifi/src/preempt_builtin/mod.rs
@@ -7,8 +7,8 @@ use core::{ffi::c_void, mem::MaybeUninit};
 
 use allocator_api2::boxed::Box;
 use arch_specific::*;
-use timer::{disable_multitasking, setup_multitasking};
-pub(crate) use timer::{disable_timer, setup_timer};
+pub(crate) use timer::setup_timer;
+use timer::{disable_multitasking, disable_timer, setup_multitasking};
 
 use crate::{
     compat::malloc::InternalMemory,
@@ -128,6 +128,7 @@ impl Scheduler for BuiltinScheduler {
     }
 
     fn disable(&self) {
+        disable_timer();
         disable_multitasking();
         delete_all_tasks();