diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2009-02-06 20:27:41 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2009-02-06 20:27:41 +0000 |
| commit | 4b075dde281ea65c731b9e55a87dd0cbeef3ea38 (patch) | |
| tree | 8c7250e7e79c55a5bd00e5334988ca7547d06a5b /sys/dev/ic | |
| parent | 5fd7a9d468ef1d46eeba0507c7493f5dcf0bb58d (diff) | |
The new font selection logic would loop and consume all kmem on proms
with only one font (such as many 712 onboard graphics). Oops again (poukram).
Diffstat (limited to 'sys/dev/ic')
| -rw-r--r-- | sys/dev/ic/sti.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/dev/ic/sti.c b/sys/dev/ic/sti.c index fe7c82cc4b7..12bff05e056 100644 --- a/sys/dev/ic/sti.c +++ b/sys/dev/ic/sti.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sti.c,v 1.58 2009/01/29 21:00:05 miod Exp $ */ +/* $OpenBSD: sti.c,v 1.59 2009/02/06 20:27:40 miod Exp $ */ /* * Copyright (c) 2000-2003 Michael Shalayeff @@ -670,7 +670,7 @@ rescan: * If our font index was bogus, we did not find the expected font. * In this case, pick the first one and be done with it. */ - if (fp->next == 0) { + if (fp->next == 0 && scr->scr_romfont == NULL) { fontindex = 0; goto rescan; } |