summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authormartin <martin@NetBSD.org>2020-03-30 18:47:33 +0000
committermartin <martin@NetBSD.org>2020-03-30 18:47:33 +0000
commit8ccdd71ec99f9c313c9ba0cd6798911bee6d055e (patch)
tree8ce3dd2f398f9ab47a4a60e4dfafb2a8ce4eb78d /sys/dev
parenta89a9320abb1a69d1911c587df90b27398979792 (diff)
Pull up following revision(s) (requested by nia in ticket #810):
sys/dev/pckbport/synaptics.c: revision 1.57 sys/dev/pckbport/synaptics.c: revision 1.58 synaptics: Allow the max_speed sysctls to be set synaptics: fix syntax
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/pckbport/synaptics.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/sys/dev/pckbport/synaptics.c b/sys/dev/pckbport/synaptics.c
index 58ffc2f84be..c49e3526140 100644
--- a/sys/dev/pckbport/synaptics.c
+++ b/sys/dev/pckbport/synaptics.c
@@ -1,4 +1,4 @@
-/* $NetBSD: synaptics.c,v 1.50.2.1 2020/03/30 18:45:16 martin Exp $ */
+/* $NetBSD: synaptics.c,v 1.50.2.2 2020/03/30 18:47:33 martin Exp $ */
/*
* Copyright (c) 2005, Steve C. Woodford
@@ -48,7 +48,7 @@
#include "opt_pms.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: synaptics.c,v 1.50.2.1 2020/03/30 18:45:16 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: synaptics.c,v 1.50.2.2 2020/03/30 18:47:33 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -862,7 +862,10 @@ pms_sysctl_synaptics_verify(SYSCTLFN_ARGS)
} else
if (node.sysctl_num == synaptics_gesture_length_nodenum ||
node.sysctl_num == synaptics_edge_motion_delta_nodenum ||
- node.sysctl_num == synaptics_up_down_motion_delta_nodenum) {
+ node.sysctl_num == synaptics_up_down_motion_delta_nodenum ||
+ node.sysctl_num == synaptics_max_speed_x_nodenum ||
+ node.sysctl_num == synaptics_max_speed_y_nodenum ||
+ node.sysctl_num == synaptics_max_speed_z_nodenum) {
if (t < 0)
return (EINVAL);
} else