summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authormacallan <macallan@NetBSD.org>2010-09-14 18:42:12 +0000
committermacallan <macallan@NetBSD.org>2010-09-14 18:42:12 +0000
commit4abeddc6aa6f0e6762ffefc4a37f705179c8a43c (patch)
treed64628505d2ac82087ea8bc56024fbb26a4eadd5 /sys/dev
parentdab970d65a9639e3ce2b08b9b83b05817a059d5e (diff)
don't muck with the screen description if we're not the console, for some
reason this leads to a NULL jump later on, at least on sparc64 should fix PR43873
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/sun/cgsix.c18
1 files changed, 2 insertions, 16 deletions
diff --git a/sys/dev/sun/cgsix.c b/sys/dev/sun/cgsix.c
index e1df00343e2..8152189b258 100644
--- a/sys/dev/sun/cgsix.c
+++ b/sys/dev/sun/cgsix.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cgsix.c,v 1.47 2010/05/04 05:11:06 macallan Exp $ */
+/* $NetBSD: cgsix.c,v 1.48 2010/09/14 18:42:12 macallan Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -78,7 +78,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cgsix.c,v 1.47 2010/05/04 05:11:06 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cgsix.c,v 1.48 2010/09/14 18:42:12 macallan Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -637,20 +637,6 @@ cg6attach(struct cgsix_softc *sc, const char *name, int isconsole)
* we're not the console so we just clear the screen and don't
* set up any sort of text display
*/
- if (cgsix_defaultscreen.textops == NULL) {
- /*
- * ugly, but...
- * we want the console settings to win, so we only
- * touch anything when we find an untouched screen
- * definition. In this case we fill it from fb to
- * avoid problems in case no cgsix is the console
- */
- ri = &sc->sc_fb.fb_rinfo;
- cgsix_defaultscreen.textops = &ri->ri_ops;
- cgsix_defaultscreen.capabilities = ri->ri_caps;
- cgsix_defaultscreen.nrows = ri->ri_rows;
- cgsix_defaultscreen.ncols = ri->ri_cols;
- }
}
aa.scrdata = &cgsix_screenlist;