blob: 3405117c32a568e4e0adf25fb0254815652a8090 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
|
diff --git a/blackmagic-io-14.4.1a4/bm_util.c b/blackmagic-io-14.4.1a4/bm_util.c
index 66751cb..d4beb70 100644
--- a/blackmagic-io-14.4.1a4/bm_util.c
+++ b/blackmagic-io-14.4.1a4/bm_util.c
@@ -471,7 +471,11 @@ void bm_timer_free(bm_timer_t* timer)
{
#if KERNEL_VERSION_OR_LATER(4, 15, 0)
struct bm_timer_wrapper* timer_wrapper = container_of(timer, struct bm_timer_wrapper, timer);
- del_timer(timer);
+ #if KERNEL_VERSION_OR_LATER(6, 14, 0)
+ timer_delete(timer);
+ #else
+ del_timer(timer);
+ #endif
bm_kfree(timer_wrapper);
#else
del_timer(timer);
@@ -491,7 +495,11 @@ void bm_timer_expire_at(bm_timer_t* timer, uint64_t ns)
void bm_timer_cancel(bm_timer_t* timer)
{
- del_timer_sync(timer);
+ #if KERNEL_VERSION_OR_LATER(6, 14, 0)
+ timer_delete_sync(timer);
+ #else
+ del_timer_sync(timer);
+ #endif
}
// Event waiting
|