diff options
| author | vitezslav batrla - Sun Microsystems - Prague Czech Republic <Vitezslav.Batrla@Sun.COM> | 2010-04-28 09:25:44 +0200 |
|---|---|---|
| committer | vitezslav batrla - Sun Microsystems - Prague Czech Republic <Vitezslav.Batrla@Sun.COM> | 2010-04-28 09:25:44 +0200 |
| commit | 2e98bdabdfa935eb368c090f1cecbba5619c88ee (patch) | |
| tree | b6a85bb9440a5c27b8c2acf9ad5ab8e4cfa51312 /usr/src | |
| parent | 9448b0f71a35e1ee1009ec0a511666a68836380d (diff) | |
| download | illumos-joyent-2e98bdabdfa935eb368c090f1cecbba5619c88ee.tar.gz | |
6945319 pcieb_initchild() misinterprets return from ndi_merge_node(), issues bogus warning
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/uts/common/io/pciex/pcieb.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/usr/src/uts/common/io/pciex/pcieb.c b/usr/src/uts/common/io/pciex/pcieb.c index 16ac203190..3137d24859 100644 --- a/usr/src/uts/common/io/pciex/pcieb.c +++ b/usr/src/uts/common/io/pciex/pcieb.c @@ -19,8 +19,7 @@ * CDDL HEADER END */ /* - * Copyright 2010 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. + * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. */ /* @@ -730,7 +729,7 @@ pcieb_initchild(dev_info_t *child) * Try to merge the properties from this prototype * node into real h/w nodes. */ - if (ndi_merge_node(child, pcieb_name_child) != DDI_SUCCESS) { + if (ndi_merge_node(child, pcieb_name_child) == DDI_SUCCESS) { /* * Merged ok - return failure to remove the node. */ |