upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-04-28 09:37:08 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix inconsistent token parameters for kbd_allocate() and kbd_release() in vt(4).

Browse source 
PR:		191306
Submitted by:	jau789@gmail.com
Sponsored by:	The FreeBSD Foundation
This commit is contained in:
Aleksandr Rybalko 2014-07-09 14:36:03 +00:00
parent 7724489236
commit 97f3c4e8a4
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
sys/dev/vt/vt_core.c
View file

@ -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;
}