Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/sparc64/sparc64 In register_device(), skip indirect...



details:   https://anonhg.NetBSD.org/src/rev/b2b632eea255
branches:  trunk
changeset: 782427:b2b632eea255
user:      jdc <jdc%NetBSD.org@localhost>
date:      Fri Nov 02 17:47:29 2012 +0000

description:
In register_device(), skip indirectly attached iic children (ia_name is NULL).

diffstat:

 sys/arch/sparc64/sparc64/autoconf.c |  7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diffs (28 lines):

diff -r 25c8316335af -r b2b632eea255 sys/arch/sparc64/sparc64/autoconf.c
--- a/sys/arch/sparc64/sparc64/autoconf.c       Fri Nov 02 17:14:41 2012 +0000
+++ b/sys/arch/sparc64/sparc64/autoconf.c       Fri Nov 02 17:47:29 2012 +0000
@@ -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 @@
        } 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;



Home | Main Index | Thread Index | Old Index