svn commit: r313550 - stable/11/sys/dev/vt

[Ed Maste]

Author: emaste
Date: Fri Feb 10 14:54:20 2017
New Revision: 313550
URL: https://svnweb.freebsd.org/changeset/base/313550

Log:
  MFC r304430: vt: fix old keyboard release in CONS_SETKBD
  
  On the first switch we previously released the newly allocated keyboard
  instead of the old one. Keyboard state was very confused afterwards for
  further keyboard switches.
  
  Submitted by:	bde

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

Modified: stable/11/sys/dev/vt/vt_core.c
==============================================================================
--- stable/11/sys/dev/vt/vt_core.c	Fri Feb 10 14:49:04 2017	(r313549)
+++ stable/11/sys/dev/vt/vt_core.c	Fri Feb 10 14:54:20 2017	(r313550)
@@ -2359,6 +2359,7 @@ skip_thunk:
 			    (void *)vd, vt_kbdevent, vd);
 			if (i >= 0) {
 				if (vd->vd_keyboard != -1) {
+					kbd = kbd_get_keyboard(vd->vd_keyboard);
 					vt_save_kbd_state(vd->vd_curwindow, kbd);
 					kbd_release(kbd, (void *)vd);
 				}