CVS commit: src/sys/dev/pci

[Michael Lorenz]

Module Name:    src
Committed By:   macallan
Date:           Thu Mar 21 17:40:37 UTC 2019

Modified Files:
        src/sys/dev/pci: radeonfb.c

Log Message:
don't malloc(0)
spotted by mrg@


To generate a diff of this commit:
cvs rdiff -u -r1.101 -r1.102 src/sys/dev/pci/radeonfb.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/pci/radeonfb.c
diff -u src/sys/dev/pci/radeonfb.c:1.101 src/sys/dev/pci/radeonfb.c:1.102
--- src/sys/dev/pci/radeonfb.c:1.101	Wed Mar 20 23:05:18 2019
+++ src/sys/dev/pci/radeonfb.c	Thu Mar 21 17:40:36 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: radeonfb.c,v 1.101 2019/03/20 23:05:18 macallan Exp $ */
+/*	$NetBSD: radeonfb.c,v 1.102 2019/03/21 17:40:36 macallan Exp $ */
 
 /*-
  * Copyright (c) 2006 Itronix Inc.
@@ -70,7 +70,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: radeonfb.c,v 1.101 2019/03/20 23:05:18 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radeonfb.c,v 1.102 2019/03/21 17:40:36 macallan Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -1401,11 +1401,13 @@ radeonfb_loadbios(struct radeonfb_softc 
 				       RADEON_CRTC_DISPLAY_DIS));
 	pci_find_rom(pa, romt, romh, romsz, PCI_ROM_CODE_TYPE_X86, &biosh,
 	    &sc->sc_biossz);
-	if (sc->sc_biossz != 0) printf("found disabled BIOS\n");
 
 foundit:
-	sc->sc_bios = malloc(sc->sc_biossz, M_DEVBUF, M_WAITOK);
-	bus_space_read_region_1(romt, biosh, 0, sc->sc_bios, sc->sc_biossz);
+	if (sc->sc_biossz > 0) {
+		sc->sc_bios = malloc(sc->sc_biossz, M_DEVBUF, M_WAITOK);
+		bus_space_read_region_1(romt, biosh, 0, sc->sc_bios,
+		    sc->sc_biossz);
+	}
 
 	if (bios_voodoo != 0) {
 		radeonfb_put32(sc, RADEON_CRTC_EXT_CNTL, extc);