From 5071b5688f7fc8cf21016c592968c27a4edc242a Mon Sep 17 00:00:00 2001 From: Charles Longeau Date: Sun, 15 Feb 2009 17:08:24 +0000 Subject: change M_WAITOK --> M_WAITOK | M_CANFAIL with help from miod@ ok miod@ oga@ --- sys/dev/ic/vga.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/ic/vga.c b/sys/dev/ic/vga.c index 511a480278c..11a1cfba0da 100644 --- a/sys/dev/ic/vga.c +++ b/sys/dev/ic/vga.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vga.c,v 1.48 2009/02/01 14:37:22 miod Exp $ */ +/* $OpenBSD: vga.c,v 1.49 2009/02/15 17:08:23 chl Exp $ */ /* $NetBSD: vga.c,v 1.28.2.1 2000/06/30 16:27:47 simonb Exp $ */ /*- @@ -937,7 +937,7 @@ vga_load_font(v, cookie, data) if (vc->vc_fonts[slot] != NULL) return (EEXIST); - f = malloc(sizeof(struct vgafont), M_DEVBUF, M_WAITOK); + f = malloc(sizeof(struct vgafont), M_DEVBUF, M_WAITOK | M_CANFAIL); if (f == NULL) return (ENOMEM); strlcpy(f->name, data->name, sizeof(f->name)); -- cgit v1.2.3