[src/trunk]: src/sys/dev/marvell Set NULL to tag when the property doesn't ge...

[kiyohara <kiyohara%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/a9dcbc5b59d0
branches:  trunk
changeset: 755343:a9dcbc5b59d0
user:      kiyohara <kiyohara%NetBSD.org@localhost>
date:      Wed Jun 02 06:33:40 2010 +0000

description:
Set NULL to tag when the property doesn't get it.

diffstat:

 sys/dev/marvell/gtpci.c |  22 ++++++++++++++--------
 1 files changed, 14 insertions(+), 8 deletions(-)

diffs (46 lines):

diff -r bdb6bf187dfa -r a9dcbc5b59d0 sys/dev/marvell/gtpci.c
--- a/sys/dev/marvell/gtpci.c   Wed Jun 02 06:24:59 2010 +0000
+++ b/sys/dev/marvell/gtpci.c   Wed Jun 02 06:33:40 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: gtpci.c,v 1.23 2010/06/02 06:24:59 kiyohara Exp $      */
+/*     $NetBSD: gtpci.c,v 1.24 2010/06/02 06:33:40 kiyohara Exp $      */
 /*
  * Copyright (c) 2008, 2009 KIYOHARA Takashi
  * All rights reserved.
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gtpci.c,v 1.23 2010/06/02 06:24:59 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gtpci.c,v 1.24 2010/06/02 06:33:40 kiyohara Exp $");
 
 #include "opt_pci.h"
 #include "pci.h"
@@ -144,15 +144,21 @@
 
 #if NPCI > 0
        iot = prop_dictionary_get(dict, "io-bus-tag");
-       if (iot == NULL)
+       if (iot != NULL) {
+               KASSERT(prop_object_type(iot) == PROP_TYPE_DATA);
+               gtpci_io_bs_tag = __UNCONST(prop_data_data_nocopy(iot));
+       } else {
                aprint_error_dev(self, "no io-bus-tag property\n");
-       KASSERT(prop_object_type(iot) == PROP_TYPE_DATA);
-       gtpci_io_bs_tag = __UNCONST(prop_data_data_nocopy(iot));
+               gtpci_io_bs_tag = NULL;
+       }
        memt = prop_dictionary_get(dict, "mem-bus-tag");
-       if (memt == NULL)
+       if (memt != NULL) {
+               KASSERT(prop_object_type(memt) == PROP_TYPE_DATA);
+               gtpci_mem_bs_tag = __UNCONST(prop_data_data_nocopy(memt));
+       } else {
                aprint_error_dev(self, "no mem-bus-tag property\n");
-       KASSERT(prop_object_type(memt) == PROP_TYPE_DATA);
-       gtpci_mem_bs_tag = __UNCONST(prop_data_data_nocopy(memt));
+               gtpci_mem_bs_tag = NULL;
+       }
        pc = prop_dictionary_get(dict, "pci-chipset");
        if (pc == NULL) {
                aprint_error_dev(self, "no pci-chipset property\n");