1 files changed, 6 insertions, 11 deletions

diff --git a/sys/dev/evdev/uinput.c b/sys/dev/evdev/uinput.c
index 2449e80645f41..3edf14284a1f4 100644
--- a/sys/dev/evdev/uinput.c
+++ b/sys/dev/evdev/uinput.c
@@ -145,17 +145,13 @@ uinput_knlunlock(void *arg)
 }
 
 static void
-uinput_knl_assert_locked(void *arg)
+uinput_knl_assert_lock(void *arg, int what)
 {
 
-	sx_assert((struct sx*)arg, SA_XLOCKED);
-}
-
-static void
-uinput_knl_assert_unlocked(void *arg)
-{
-
-	sx_assert((struct sx*)arg, SA_UNLOCKED);
+	if (what == LA_LOCKED)
+		sx_assert((struct sx*)arg, SA_XLOCKED);
+	else
+		sx_assert((struct sx*)arg, SA_UNLOCKED);
 }
 
 static void
@@ -212,8 +208,7 @@ uinput_open(struct cdev *dev, int oflags, int devtype, struct thread *td)
 
 	sx_init(&state->ucs_lock, "uinput");
 	knlist_init(&state->ucs_selp.si_note, &state->ucs_lock, uinput_knllock,
-	    uinput_knlunlock, uinput_knl_assert_locked,
-	    uinput_knl_assert_unlocked);
+	    uinput_knlunlock, uinput_knl_assert_lock);
 
 	devfs_set_cdevpriv(state, uinput_dtor);
 	return (0);