Module Name: src
Committed By: jdc
Date: Fri Nov 2 17:47:30 UTC 2012
Modified Files:
src/sys/arch/sparc64/sparc64: autoconf.c
Log Message:
In register_device(), skip indirectly attached iic children (ia_name is NULL).
To generate a diff of this commit:
cvs rdiff -u -r1.190 -r1.191 src/sys/arch/sparc64/sparc64/autoconf.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/sparc64/sparc64/autoconf.c
diff -u src/sys/arch/sparc64/sparc64/autoconf.c:1.190 src/sys/arch/sparc64/sparc64/autoconf.c:1.191
--- src/sys/arch/sparc64/sparc64/autoconf.c:1.190 Sat Oct 27 17:18:12 2012
+++ src/sys/arch/sparc64/sparc64/autoconf.c Fri Nov 2 17:47:29 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.190 2012/10/27 17:18:12 chs Exp $ */
+/* $NetBSD: autoconf.c,v 1.191 2012/11/02 17:47:29 jdc Exp $ */
/*
* Copyright (c) 1996
@@ -48,7 +48,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.190 2012/10/27 17:18:12 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.191 2012/11/02 17:47:29 jdc Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -913,6 +913,9 @@ device_register(device_t dev, void *aux)
} else if (device_is_a(busdev, "iic")) {
struct i2c_attach_args *ia = aux;
+ if (ia->ia_name == NULL) /* indirect config */
+ return;
+
ofnode = (int)ia->ia_cookie;
} else if (device_is_a(dev, "sd") || device_is_a(dev, "cd")) {
struct scsipibus_attach_args *sa = aux;
