Module Name: src
Committed By: msaitoh
Date: Mon Oct 23 09:21:40 UTC 2017
Modified Files:
src/sys/arch/amiga/dev: if_bah_zbus.c
Log Message:
Return if bah_attach_subr() failed.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/amiga/dev/if_bah_zbus.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/amiga/dev/if_bah_zbus.c
diff -u src/sys/arch/amiga/dev/if_bah_zbus.c:1.16 src/sys/arch/amiga/dev/if_bah_zbus.c:1.17
--- src/sys/arch/amiga/dev/if_bah_zbus.c:1.16 Fri Oct 30 12:19:08 2015
+++ src/sys/arch/amiga/dev/if_bah_zbus.c Mon Oct 23 09:21:40 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: if_bah_zbus.c,v 1.16 2015/10/30 12:19:08 phx Exp $ */
+/* $NetBSD: if_bah_zbus.c,v 1.17 2017/10/23 09:21:40 msaitoh Exp $ */
/*-
* Copyright (c) 1994, 1995, 1998 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
#endif
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_bah_zbus.c,v 1.16 2015/10/30 12:19:08 phx Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_bah_zbus.c,v 1.17 2017/10/23 09:21:40 msaitoh Exp $");
/*
* Driver frontend for the Commodore Busines Machines and the
@@ -98,6 +98,7 @@ bah_zbus_attach(device_t parent, device_
struct bah_zbus_softc *bsc = device_private(self);
struct bah_softc *sc = &bsc->sc_bah;
struct zbus_args *zap = aux;
+ int rv;
sc->sc_dev = self;
#if (defined(BAH_DEBUG) && (BAH_DEBUG > 2))
@@ -115,7 +116,11 @@ bah_zbus_attach(device_t parent, device_
sc->sc_reset = bah_zbus_reset;
- bah_attach_subr(sc);
+ rv = bah_attach_subr(sc);
+ if (rv != 0) {
+ aprint_error_dev(self, "bah_attach_subr failed(%d)\n", rv);
+ return;
+ }
bsc->sc_isr.isr_intr = bahintr;
bsc->sc_isr.isr_arg = sc;
