summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Kettenis <kettenis@cvs.openbsd.org>2008-03-09 13:28:21 +0000
committerMark Kettenis <kettenis@cvs.openbsd.org>2008-03-09 13:28:21 +0000
commita6171670746c092199891eb8f0cac9dab85422aa (patch)
treee46d54946cd0d5f0d9720cc05fdb627936dd5af1
parenta63159da0545fb0709d1166ca3caf9c3d097a754 (diff)
Check "status" property.
-rw-r--r--sys/arch/sparc64/dev/fhc.c5
-rw-r--r--sys/arch/sparc64/dev/sbus.c5
2 files changed, 8 insertions, 2 deletions
diff --git a/sys/arch/sparc64/dev/fhc.c b/sys/arch/sparc64/dev/fhc.c
index 384f19abf2c..2aef68cc418 100644
--- a/sys/arch/sparc64/dev/fhc.c
+++ b/sys/arch/sparc64/dev/fhc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fhc.c,v 1.15 2008/01/17 22:53:18 kettenis Exp $ */
+/* $OpenBSD: fhc.c,v 1.16 2008/03/09 13:27:47 kettenis Exp $ */
/*
* Copyright (c) 2004 Jason L. Wright (jason@thought.net)
@@ -96,6 +96,9 @@ fhc_attach(struct fhc_softc *sc)
for (node = node0; node; node = nextsibling(node)) {
struct fhc_attach_args fa;
+ if (!checkstatus(node))
+ continue;
+
bzero(&fa, sizeof(fa));
fa.fa_node = node;
diff --git a/sys/arch/sparc64/dev/sbus.c b/sys/arch/sparc64/dev/sbus.c
index 560bf793770..ecf8976e382 100644
--- a/sys/arch/sparc64/dev/sbus.c
+++ b/sys/arch/sparc64/dev/sbus.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sbus.c,v 1.32 2008/01/17 22:53:18 kettenis Exp $ */
+/* $OpenBSD: sbus.c,v 1.33 2008/03/09 13:28:20 kettenis Exp $ */
/* $NetBSD: sbus.c,v 1.46 2001/10/07 20:30:41 eeh Exp $ */
/*-
@@ -415,6 +415,9 @@ sbus_attach_common(struct sbus_softc *sc, int node, int indirect)
*/
node0 = firstchild(node);
for (node = node0; node; node = nextsibling(node)) {
+ if (!checkstatus(node))
+ continue;
+
if (sbus_setup_attach_args(sc, sbt, sc->sc_dmatag,
node, &sa) != 0) {
DPRINTF(SDB_CHILD,