From: Matthew Dillon <dillon@apollo.backplane.com>
Date: Tue, 31 Aug 2010 04:28:09 +0000 (-0700)
Subject: kernel - Fix missing release of tty_token
X-Git-Tag: v2.9.0~321
X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/261a35c13161f8a71592bdb700ba6f3b39334c79

kernel - Fix missing release of tty_token

* Fix one missing release and one misordered release.  These were
  causing the low level SMP AP boot to enter with 2 mplock counts
  instead of 1.
---

diff --git a/sys/dev/video/fb/fb.c b/sys/dev/video/fb/fb.c
index f7b6506cc8..7e91883aef 100644
--- a/sys/dev/video/fb/fb.c
+++ b/sys/dev/video/fb/fb.c
@@ -172,6 +172,7 @@ vid_register(video_adapter_t *adp)
 		if (strcmp(p->name, adp->va_name) == 0) {
 			adapter[index] = adp;
 			vidsw[index] = p->vidsw;
+			lwkt_reltoken(&tty_token);
 			return index;
 		}
 	}
@@ -542,9 +543,12 @@ int genfbioctl(genfb_softc_t *sc, video_adapter_t *adp, u_long cmd,
 int genfbmmap(genfb_softc_t *sc, video_adapter_t *adp, vm_offset_t offset,
 	      int prot)
 {
+	int error;
+
 	lwkt_gettoken(&tty_token);
-	return (*vidsw[adp->va_index]->mmap)(adp, offset, prot);
+	error = (*vidsw[adp->va_index]->mmap)(adp, offset, prot);
 	lwkt_reltoken(&tty_token);
+	return (error);
 }
 
 #endif /* FB_INSTALL_CDEV */