Module Name: src
Committed By: nisimura
Date: Wed Mar 18 10:05:25 UTC 2020
Modified Files:
src/sys/arch/arm/sociox: sni_emmc.c
Log Message:
attempt graceful failure
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/sociox/sni_emmc.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/arch/arm/sociox/sni_emmc.c
diff -u src/sys/arch/arm/sociox/sni_emmc.c:1.2 src/sys/arch/arm/sociox/sni_emmc.c:1.3
--- src/sys/arch/arm/sociox/sni_emmc.c:1.2 Wed Mar 18 06:44:57 2020
+++ src/sys/arch/arm/sociox/sni_emmc.c Wed Mar 18 10:05:24 2020
@@ -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 @@ sniemmc_attach_i(device_t self)
}
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;
