diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d6b677e..0126fca 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -23,9 +23,6 @@ jobs: - master host: - ubuntu-22.04 - include: - - linux: v5.10 - host: ubuntu-20.04 steps: - uses: actions/checkout@v4 with: diff --git a/hdaps.c b/hdaps.c index 76930a3..eb2baf8 100644 --- a/hdaps.c +++ b/hdaps.c @@ -427,7 +427,11 @@ static int hdaps_probe(struct platform_device *dev) static int hdaps_suspend(struct platform_device *dev, pm_message_t state) { /* Don't do hdaps polls until resume re-initializes the sensor. */ +#if LINUX_VERSION_CODE < KERNEL_VERSION(6,15,0) del_timer_sync(&hdaps_timer); +#else + timer_delete_sync(&hdaps_timer); +#endif hdaps_device_shutdown(); /* ignore errors, effect is negligible */ return 0; } @@ -671,7 +675,11 @@ static void hdaps_mousedev_close(struct input_dev *dev) { mutex_lock(&hdaps_users_mtx); if (--hdaps_users == 0) /* no input users left */ +#if LINUX_VERSION_CODE < KERNEL_VERSION(6,15,0) del_timer_sync(&hdaps_timer); +#else + timer_delete_sync(&hdaps_timer); +#endif mutex_unlock(&hdaps_users_mtx); module_put(THIS_MODULE);