Disable irq before removing handler in cyw43_irq_deinit (earlephilhower#2185)

gazzyt · web-flow · commit 09482ed7a0cc · 2025-01-20T13:42:46.000-06:00
diff --git a/src/rp2_common/pico_cyw43_driver/cyw43_driver.c b/src/rp2_common/pico_cyw43_driver/cyw43_driver.c
@@ -63,8 +63,8 @@ uint32_t cyw43_irq_deinit(__unused void *param) {
 #ifndef NDEBUG
     assert(get_core_num() == async_context_core_num(cyw43_async_context));
 #endif
-    gpio_remove_raw_irq_handler(CYW43_PIN_WL_HOST_WAKE, cyw43_gpio_irq_handler);
     cyw43_set_irq_enabled(false);
+    gpio_remove_raw_irq_handler(CYW43_PIN_WL_HOST_WAKE, cyw43_gpio_irq_handler);
     return 0;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -63,8 +63,8 @@ uint32_t cyw43_irq_deinit(__unused void *param) {`
`63`	`63`	`#ifndef NDEBUG`
`64`	`64`	`assert(get_core_num() == async_context_core_num(cyw43_async_context));`
`65`	`65`	`#endif`
`66`		`- gpio_remove_raw_irq_handler(CYW43_PIN_WL_HOST_WAKE, cyw43_gpio_irq_handler);`
`67`	`66`	`cyw43_set_irq_enabled(false);`
	`67`	`+ gpio_remove_raw_irq_handler(CYW43_PIN_WL_HOST_WAKE, cyw43_gpio_irq_handler);`
`68`	`68`	`return 0;`
`69`	`69`	`}`
`70`	`70`