Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/dev/wsfont Restore the system priority level on error re...
details: https://anonhg.NetBSD.org/src/rev/4130095a28d2
branches: trunk
changeset: 480221:4130095a28d2
user: enami <enami%NetBSD.org@localhost>
date: Fri Jan 07 03:25:46 2000 +0000
description:
Restore the system priority level on error return.
diffstat:
sys/dev/wsfont/wsfont.c | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diffs (40 lines):
diff -r 72b06e5533bb -r 4130095a28d2 sys/dev/wsfont/wsfont.c
--- a/sys/dev/wsfont/wsfont.c Fri Jan 07 03:25:34 2000 +0000
+++ b/sys/dev/wsfont/wsfont.c Fri Jan 07 03:25:46 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: wsfont.c,v 1.11 2000/01/05 18:44:26 ad Exp $ */
+/* $NetBSD: wsfont.c,v 1.12 2000/01/07 03:25:46 enami Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wsfont.c,v 1.11 2000/01/05 18:44:26 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wsfont.c,v 1.12 2000/01/07 03:25:46 enami Exp $");
#include "opt_wsfont.h"
@@ -419,15 +419,19 @@
if ((ent = wsfont_find0(cookie)) != NULL) {
if (bitorder && bitorder != ent->font->bitorder) {
- if (ent->lockcount)
+ if (ent->lockcount) {
+ splx(s);
return (-1);
+ }
wsfont_revbit(ent->font);
ent->font->bitorder = bitorder;
}
if (byteorder && byteorder != ent->font->byteorder) {
- if (ent->lockcount)
+ if (ent->lockcount) {
+ splx(s);
return (-1);
+ }
wsfont_revbyte(ent->font);
ent->font->byteorder = byteorder;
}
Home |
Main Index |
Thread Index |
Old Index