Module Name: src
Committed By: rin
Date: Mon Oct 4 12:26:29 UTC 2021
Modified Files:
src/sys/dev/rasops: rasops.c
Log Message:
rasops_reconfig: Do not abort even if font stride is not supported by
rasops_make_box_chars_*() functions; Stop using ri_optfont instead.
XXX
Add rasops_make_box_chars_24().
To generate a diff of this commit:
cvs rdiff -u -r1.123 -r1.124 src/sys/dev/rasops/rasops.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/rasops/rasops.c
diff -u src/sys/dev/rasops/rasops.c:1.123 src/sys/dev/rasops/rasops.c:1.124
--- src/sys/dev/rasops/rasops.c:1.123 Thu Jul 2 07:49:44 2020
+++ src/sys/dev/rasops/rasops.c Mon Oct 4 12:26:29 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: rasops.c,v 1.123 2020/07/02 07:49:44 rin Exp $ */
+/* $NetBSD: rasops.c,v 1.124 2021/10/04 12:26:29 rin Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rasops.c,v 1.123 2020/07/02 07:49:44 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rasops.c,v 1.124 2021/10/04 12:26:29 rin Exp $");
#ifdef _KERNEL_OPT
#include "opt_rasops.h"
@@ -376,11 +376,12 @@ rasops_reconfig(struct rasops_info *ri,
rasops_make_box_chars_32(ri);
break;
default:
- aprint_error(
+ kmem_free(ri->ri_optfont.data, len);
+ ri->ri_optfont.data = NULL;
+ aprint_verbose(
"%s: font stride assumptions botched",
__func__);
- splx(s);
- return -1;
+ break;
}
}
} else
