diff options
| author | rin <rin@NetBSD.org> | 2021-10-04 12:26:29 +0000 |
|---|---|---|
| committer | rin <rin@NetBSD.org> | 2021-10-04 12:26:29 +0000 |
| commit | e9a3fee5e4273058bbc343449989c829ae5df84c (patch) | |
| tree | ac421fa2e128e7e0ea3a66d8f74139ed60aa91c5 /sys/dev/rasops | |
| parent | fc4b5144741aaf3938336f552aa7f33432c930ac (diff) | |
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().
Diffstat (limited to 'sys/dev/rasops')
| -rw-r--r-- | sys/dev/rasops/rasops.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/sys/dev/rasops/rasops.c b/sys/dev/rasops/rasops.c index 6f63f12f012..d9757d7c546 100644 --- a/sys/dev/rasops/rasops.c +++ b/sys/dev/rasops/rasops.c @@ -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, int wantrows, int wantcols) 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 |
