[src/trunk]: src/sys/arch/arm/acpi Skip v2m probe if armgic fails to attach

[jmcneill <jmcneill%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/181e8a728346
branches:  trunk
changeset: 1012326:181e8a728346
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Mon Jul 27 18:38:10 2020 +0000

description:
Skip v2m probe if armgic fails to attach

diffstat:

 sys/arch/arm/acpi/gic_acpi.c |  9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diffs (34 lines):

diff -r 4dcf49bebdfb -r 181e8a728346 sys/arch/arm/acpi/gic_acpi.c
--- a/sys/arch/arm/acpi/gic_acpi.c      Mon Jul 27 18:36:23 2020 +0000
+++ b/sys/arch/arm/acpi/gic_acpi.c      Mon Jul 27 18:38:10 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: gic_acpi.c,v 1.4 2019/10/14 11:00:13 jmcneill Exp $ */
+/* $NetBSD: gic_acpi.c,v 1.5 2020/07/27 18:38:10 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
 #include "pci.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gic_acpi.c,v 1.4 2019/10/14 11:00:13 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gic_acpi.c,v 1.5 2020/07/27 18:38:10 jmcneill Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -124,12 +124,13 @@
        };
 
        armgic = config_found(self, &mpcaa, NULL);
-       if (armgic != NULL)
+       if (armgic != NULL) {
                arm_fdt_irq_set_handler(armgic_irq_handler);
 
 #if NPCI > 0
-       acpi_madt_walk(gic_v2m_acpi_find_msi_frame, armgic);
+               acpi_madt_walk(gic_v2m_acpi_find_msi_frame, armgic);
 #endif
+       }
 }
 
 static ACPI_STATUS