diff options
| author | ray <ray@FreeBSD.org> | 2014-07-09 14:36:03 +0000 |
|---|---|---|
| committer | ray <ray@FreeBSD.org> | 2014-07-09 14:36:03 +0000 |
| commit | 6e2011ab13459e51be9cfc0df17d8fa21237f7ef (patch) | |
| tree | 88ea18accffa8d4d87195486509858c0c4413159 | |
| parent | 5f169a945b06bd66dc75dfa10219eadfb6a3f5c7 (diff) | |
| download | FreeBSD-src-6e2011ab13459e51be9cfc0df17d8fa21237f7ef.zip FreeBSD-src-6e2011ab13459e51be9cfc0df17d8fa21237f7ef.tar.gz | |
Fix inconsistent token parameters for kbd_allocate() and kbd_release() in vt(4).
PR: 191306
Submitted by: jau789@gmail.com
Sponsored by: The FreeBSD Foundation
| -rw-r--r-- | sys/dev/vt/vt_core.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/sys/dev/vt/vt_core.c b/sys/dev/vt/vt_core.c index ad90463..915526c 100644 --- a/sys/dev/vt/vt_core.c +++ b/sys/dev/vt/vt_core.c @@ -618,7 +618,7 @@ vt_kbdevent(keyboard_t *kbd, int event, void *arg) case KBDIO_UNLOADING: mtx_lock(&Giant); vd->vd_keyboard = -1; - kbd_release(kbd, (void *)&vd->vd_keyboard); + kbd_release(kbd, (void *)vd); mtx_unlock(&Giant); return (0); default: @@ -1785,11 +1785,10 @@ skip_thunk: return (EINVAL); } i = kbd_allocate(kbd->kb_name, kbd->kb_unit, - (void *)&vd->vd_keyboard, vt_kbdevent, vd); + (void *)vd, vt_kbdevent, vd); if (i >= 0) { if (vd->vd_keyboard != -1) { - kbd_release(kbd, - (void *)&vd->vd_keyboard); + kbd_release(kbd, (void *)vd); } kbd = kbd_get_keyboard(i); vd->vd_keyboard = i; @@ -1811,7 +1810,7 @@ skip_thunk: mtx_unlock(&Giant); return (EINVAL); } - error = kbd_release(kbd, (void *)&vd->vd_keyboard); + error = kbd_release(kbd, (void *)vd); if (error == 0) { vd->vd_keyboard = -1; } |
