Skip to content

Commit 902ffab

Browse files
belozerparoj
authored andcommitted
Compatibility with kernel 6.15.0
Renamed del_timer_sync to timer_delete_sync. Reason: torvalds/linux@8fa7292 Compatibility with older kernels has been preserved.
1 parent 1097ff1 commit 902ffab

1 file changed

Lines changed: 7 additions & 1 deletion

File tree

xpad.c

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@
6262
*/
6363

6464
// #define DEBUG
65+
#include <linux/version.h>
6566
#include <linux/bits.h>
6667
#include <linux/kernel.h>
6768
#include <linux/input.h>
@@ -73,6 +74,11 @@
7374
#include <linux/usb/quirks.h>
7475
#include <linux/timer.h>
7576

77+
// backward compatibility. del_timer_sync is renamed to timer_delete_sync since 6.15.0
78+
#if LINUX_VERSION_CODE < KERNEL_VERSION(6,15,0)
79+
#define timer_delete_sync del_timer_sync
80+
#endif
81+
7682
// enable compilation on pre 6.1 kernels
7783
#ifndef ABS_PROFILE
7884
#define ABS_PROFILE ABS_MISC
@@ -2520,7 +2526,7 @@ static void xpad_disconnect(struct usb_interface *intf)
25202526

25212527
if (xpad->quirks & QUIRK_GHL_XBOXONE) {
25222528
usb_free_urb(xpad->ghl_urb);
2523-
del_timer_sync(&xpad->ghl_poke_timer);
2529+
timer_delete_sync(&xpad->ghl_poke_timer);
25242530
}
25252531

25262532
usb_free_coherent(xpad->udev, XPAD_PKT_LEN,

0 commit comments

Comments
 (0)