tp_smapi-dkms: update to 0.43.
This commit is contained in:
parent
2c1a56e076
commit
7a139e04fd
2 changed files with 3 additions and 46 deletions
|
@ -1,43 +0,0 @@
|
|||
From 76c5120f7be4880cf2c6801f872327e4e70c449f Mon Sep 17 00:00:00 2001
|
||||
From: Jan Nordholz <jnordholz@sec.t-labs.tu-berlin.de>
|
||||
Date: Mon, 4 Dec 2017 03:27:11 +0100
|
||||
Subject: [PATCH] Adapt HDAPS driver to use the new timer_setup() interface.
|
||||
|
||||
Linux 4.15 removed the ancient init_timer() API and changed the signature
|
||||
of the timer handler function.
|
||||
|
||||
Signed-off-by: Jan Nordholz <jnordholz@sec.t-labs.tu-berlin.de>
|
||||
Closes: #31
|
||||
---
|
||||
hdaps.c | 8 ++++++++
|
||||
1 file changed, 8 insertions(+)
|
||||
|
||||
diff --git a/hdaps.c b/hdaps.c
|
||||
index 0763c3a..76930a3 100644
|
||||
--- hdaps.c
|
||||
+++ hdaps.c
|
||||
@@ -469,7 +469,11 @@ static void hdaps_calibrate(void)
|
||||
/* Timer handler for updating the input device. Runs in softirq context,
|
||||
* so avoid lenghty or blocking operations.
|
||||
*/
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,15,0)
|
||||
static void hdaps_mousedev_poll(unsigned long unused)
|
||||
+#else
|
||||
+static void hdaps_mousedev_poll(struct timer_list *unused)
|
||||
+#endif
|
||||
{
|
||||
int ret;
|
||||
|
||||
@@ -779,8 +783,12 @@ static int __init hdaps_init(void)
|
||||
hdaps_invert = 0; /* default */
|
||||
|
||||
/* Init timer before platform_driver_register, in case of suspend */
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,15,0)
|
||||
init_timer(&hdaps_timer);
|
||||
hdaps_timer.function = hdaps_mousedev_poll;
|
||||
+#else
|
||||
+ timer_setup(&hdaps_timer, hdaps_mousedev_poll, 0);
|
||||
+#endif
|
||||
ret = platform_driver_register(&hdaps_driver);
|
||||
if (ret)
|
||||
goto out;
|
|
@ -1,7 +1,7 @@
|
|||
# Template file for 'tp_smapi-dkms'
|
||||
pkgname=tp_smapi-dkms
|
||||
version=0.42
|
||||
revision=3
|
||||
version=0.43
|
||||
revision=1
|
||||
wrksrc=tp_smapi-${version}
|
||||
only_for_archs="i686 i686-musl x86_64 x86_64-musl"
|
||||
short_desc="IBM ThinkPad hardware functions driver"
|
||||
|
@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
|
|||
license="GPL-2"
|
||||
homepage="http://www.thinkwiki.org/wiki/Tp_smapi"
|
||||
distfiles="https://github.com/evgeni/tp_smapi/releases/download/tp-smapi%2F${version}/tp_smapi-${version}.tgz"
|
||||
checksum=7b8d9f488c3859805f1f292bf4d518cc5b32ebb69b0ebe96367d0852dd792d27
|
||||
checksum=bcef9cd045d52a74d719b2a67ac4f5324994a856f123c0fbc55f1d769d367110
|
||||
|
||||
triggers="dkms"
|
||||
dkms_modules="tp_smapi ${version}"
|
||||
|
|
Loading…
Reference in a new issue