svn commit: r268942 - stable/9/sys/dev/vt

[Ed Maste]

Author: emaste
Date: Mon Jul 21 14:36:35 2014
New Revision: 268942
URL: http://svnweb.freebsd.org/changeset/base/268942

Log:
  MFC r268460 by ray:
  
    Fix inconsistent token parameters for kbd_allocate() and kbd_release()
    in vt(4).
  
  PR:		191306
  Submitted by:	jau789 at gmail.com
  Sponsored by:	The FreeBSD Foundation

Modified:
  stable/9/sys/dev/vt/vt_core.c
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/dev/   (props changed)

Modified: stable/9/sys/dev/vt/vt_core.c
==============================================================================
--- stable/9/sys/dev/vt/vt_core.c	Mon Jul 21 14:31:57 2014	(r268941)
+++ stable/9/sys/dev/vt/vt_core.c	Mon Jul 21 14:36:35 2014	(r268942)
@@ -536,7 +536,7 @@ vt_kbdevent(keyboard_t *kbd, int event, 
 	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:
@@ -1651,11 +1651,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;
@@ -1677,7 +1676,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;
 			}