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
31
|
From: Kentaro Hayashi <kenhys@xdump.org>
Date: Wed, 20 Aug 2025 18:18:09 +0900
Subject: Support kernel 6.15
Since linux 6.1.84, timer_delete_sync was introduced
and del_timer_sync should not be used.
Since 6.15, del_timer_sync wrapper was removed.
Author: Eason0729
Origin: https://github.com/DIGImend/digimend-kernel-drivers/pull/714
Forwarded: not-needed
---
hid-uclogic-core.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/hid-uclogic-core.c b/hid-uclogic-core.c
index 716ab97..be4630d 100644
--- a/hid-uclogic-core.c
+++ b/hid-uclogic-core.c
@@ -488,6 +488,10 @@ static int uclogic_raw_event(struct hid_device *hdev,
return 0;
}
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 84)
+#define del_timer_sync timer_delete_sync
+#endif
+
static void uclogic_remove(struct hid_device *hdev)
{
struct uclogic_drvdata *drvdata = hid_get_drvdata(hdev);
|
