git: ca4c78590095 - main - nexus: Consistently return a pointer in failure paths

The branch main has been updated by markj:

URL: https://cgit.FreeBSD.org/src/commit/?id=ca4c7859009549975229d854888231e48938035e

commit ca4c7859009549975229d854888231e48938035e
Author:     Mark Johnston <markj@FreeBSD.org>
AuthorDate: 2023-04-26 21:19:28 +0000
Commit:     Mark Johnston <markj@FreeBSD.org>
CommitDate: 2023-05-26 19:38:08 +0000

    nexus: Consistently return a pointer in failure paths
    
    No functional change intended.
    
    MFC after:      1 week
---
 sys/arm/arm/nexus.c | 2 +-
 sys/x86/x86/nexus.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sys/arm/arm/nexus.c b/sys/arm/arm/nexus.c
index 48e766b0cc62..430373d3679f 100644
--- a/sys/arm/arm/nexus.c
+++ b/sys/arm/arm/nexus.c
@@ -256,7 +256,7 @@ nexus_alloc_resource(device_t bus, device_t child, int type, int *rid,
 	if (needactivate) {
 		if (bus_activate_resource(child, type, *rid, rv)) {
 			rman_release_resource(rv);
-			return (0);
+			return (NULL);
 		}
 	}
 
diff --git a/sys/x86/x86/nexus.c b/sys/x86/x86/nexus.c
index d02d081de1e8..332b1527efbd 100644
--- a/sys/x86/x86/nexus.c
+++ b/sys/x86/x86/nexus.c
@@ -388,13 +388,13 @@ nexus_alloc_resource(device_t bus, device_t child, int type, int *rid,
 
 	rv = rman_reserve_resource(rm, start, end, count, flags, child);
 	if (rv == NULL)
-		return (0);
+		return (NULL);
 	rman_set_rid(rv, *rid);
 
 	if (needactivate) {
 		if (bus_activate_resource(child, type, *rid, rv)) {
 			rman_release_resource(rv);
-			return (0);
+			return (NULL);
 		}
 	}