[src/trunk]: src/sys/arch/arm/sociox attempt graceful failure

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

details:   https://anonhg.NetBSD.org/src/rev/dc0a77a88eb9
branches:  trunk
changeset: 1008305:dc0a77a88eb9
user:      nisimura <nisimura%NetBSD.org@localhost>
date:      Wed Mar 18 10:05:24 2020 +0000

description:
attempt graceful failure

diffstat:

 sys/arch/arm/sociox/sni_emmc.c |  10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diffs (31 lines):

diff -r dd6d9c1bc58e -r dc0a77a88eb9 sys/arch/arm/sociox/sni_emmc.c
--- a/sys/arch/arm/sociox/sni_emmc.c    Wed Mar 18 09:42:05 2020 +0000
+++ b/sys/arch/arm/sociox/sni_emmc.c    Wed Mar 18 10:05:24 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sni_emmc.c,v 1.2 2020/03/18 06:44:57 nisimura Exp $    */
+/*     $NetBSD: sni_emmc.c,v 1.3 2020/03/18 10:05:24 nisimura Exp $    */
 
 /*-
  * Copyright (c) 2020 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sni_emmc.c,v 1.2 2020/03/18 06:44:57 nisimura Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sni_emmc.c,v 1.3 2020/03/18 10:05:24 nisimura Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -256,8 +256,10 @@
        }
        return;
  fail:
-       fdtbus_intr_disestablish(sc->sc_phandle, sc->sc_ih);
-       acpi_intr_disestablish(sc->sc_ih);
+       if (sc->sc_phandle)
+               fdtbus_intr_disestablish(sc->sc_phandle, sc->sc_ih);
+       else
+               acpi_intr_disestablish(sc->sc_ih);
        sc->sc_ih = NULL;
        bus_space_unmap(sc->sc_iot, sc->sc_ioh, sc->sc_ios);
        return;