From bac2da2926463040ff8c98df36ca81a28a3457a5 Mon Sep 17 00:00:00 2001 From: "David E. O'Brien" Date: Fri, 26 Dec 2003 14:04:19 +0000 Subject: [PATCH] Don't confuse NULL with 0. --- sys/sparc64/pci/psycho.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/sparc64/pci/psycho.c b/sys/sparc64/pci/psycho.c index b6cbfbe02aa..6e473cb2d74 100644 --- a/sys/sparc64/pci/psycho.c +++ b/sys/sparc64/pci/psycho.c @@ -1078,7 +1078,7 @@ psycho_setup_intr(device_t dev, device_t child, sc = (struct psycho_softc *)device_get_softc(dev); pc = (struct psycho_clr *)malloc(sizeof(*pc), M_DEVBUF, M_NOWAIT); if (pc == NULL) - return (NULL); + return (0); /* * Hunt through all the interrupt mapping regs to look for our @@ -1094,7 +1094,7 @@ psycho_setup_intr(device_t dev, device_t child, if (!psycho_find_intrmap(sc, ino, &intrmapptr, &intrclrptr, NULL)) { device_printf(dev, "Cannot find interrupt vector %lx\n", vec); free(pc, M_DEVBUF); - return (NULL); + return (0); } #ifdef PSYCHO_DEBUG @@ -1225,7 +1225,7 @@ psycho_activate_resource(device_t bus, device_t child, int type, int rid, * on the virtual address being set and useable. */ error = sparc64_bus_mem_map(rman_get_bustag(r), - rman_get_bushandle(r), rman_get_size(r), 0, NULL, &p); + rman_get_bushandle(r), rman_get_size(r), 0, 0, &p); if (error != 0) return (error); rman_set_virtual(r, p);