summaryrefslogtreecommitdiff
path: root/usr/src/uts/common/io/devinfo.c
diff options
context:
space:
mode:
authorcth <none@none>2006-01-26 19:27:50 -0800
committercth <none@none>2006-01-26 19:27:50 -0800
commit737d277a27d4872543f597e35c470e7510f61f03 (patch)
tree28fb97f55ef300256d8013cf2f8109e0347ba5a7 /usr/src/uts/common/io/devinfo.c
parent6c4d349c64bc0bfa31cf16194222a600760f52c1 (diff)
downloadillumos-joyent-737d277a27d4872543f597e35c470e7510f61f03.tar.gz
6369724 DS_READY references should be checked for correctness
Diffstat (limited to 'usr/src/uts/common/io/devinfo.c')
-rw-r--r--usr/src/uts/common/io/devinfo.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/usr/src/uts/common/io/devinfo.c b/usr/src/uts/common/io/devinfo.c
index 3533f193fe..be0447ee7e 100644
--- a/usr/src/uts/common/io/devinfo.c
+++ b/usr/src/uts/common/io/devinfo.c
@@ -20,7 +20,7 @@
* CDDL HEADER END
*/
/*
- * Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -1633,7 +1633,7 @@ di_copytree(struct dev_info *root, di_off_t *off_p, struct di_state *st)
(void *)root, *off_p));
/* force attach drivers */
- if ((i_ddi_node_state((dev_info_t *)root) == DS_READY) &&
+ if (i_ddi_devi_attached((dev_info_t *)root) &&
(st->command & DINFOSUBTREE) && (st->command & DINFOFORCE)) {
(void) ndi_devi_config((dev_info_t *)root,
NDI_CONFIG | NDI_DEVI_PERSIST | NDI_NO_EVENT |
@@ -2927,7 +2927,7 @@ di_getprop(struct ddi_prop *prop, di_off_t *off_p, struct di_state *st,
* the driver property list. No one should rely on such
* properties.
*/
- if (i_ddi_node_state((dev_info_t *)dip) < DS_ATTACHED) {
+ if (!i_ddi_devi_attached((dev_info_t *)dip)) {
off = *off_p;
*off_p = 0;
return (off);