summaryrefslogtreecommitdiff
path: root/usr/src
diff options
context:
space:
mode:
Diffstat (limited to 'usr/src')
-rw-r--r--usr/src/lib/fm/topo/libtopo/common/mkerror.sh6
-rw-r--r--usr/src/lib/fm/topo/libtopo/common/topo_xml.c1
2 files changed, 3 insertions, 4 deletions
diff --git a/usr/src/lib/fm/topo/libtopo/common/mkerror.sh b/usr/src/lib/fm/topo/libtopo/common/mkerror.sh
index fed7a53745..01b832ba35 100644
--- a/usr/src/lib/fm/topo/libtopo/common/mkerror.sh
+++ b/usr/src/lib/fm/topo/libtopo/common/mkerror.sh
@@ -197,13 +197,13 @@ topo_strerror(int err)
s = _topo_properrstrs[err - ETOPO_PROP_UNKNOWN];
else if (err >= ETOPO_METHOD_UNKNOWN && (err - ETOPO_METHOD_UNKNOWN) <
_topo_nmethoderrstrs)
- s = _topo_methoderrstrs[err - ETOPO_PROP_UNKNOWN];
+ s = _topo_methoderrstrs[err - ETOPO_METHOD_UNKNOWN];
else if (err >= ETOPO_HDL_UNKNOWN && (err - ETOPO_HDL_UNKNOWN) <
_topo_nhdlerrstrs)
- s = _topo_hdlerrstrs[err - ETOPO_PROP_UNKNOWN];
+ s = _topo_hdlerrstrs[err - ETOPO_HDL_UNKNOWN];
else if (err >= ETOPO_FMRI_UNKNOWN && (err - ETOPO_FMRI_UNKNOWN) <
_topo_nfmrierrstrs)
- s = _topo_fmrierrstrs[err - ETOPO_PROP_UNKNOWN];
+ s = _topo_fmrierrstrs[err - ETOPO_FMRI_UNKNOWN];
else
s = _topo_errstrs[0];
diff --git a/usr/src/lib/fm/topo/libtopo/common/topo_xml.c b/usr/src/lib/fm/topo/libtopo/common/topo_xml.c
index 41be9ce667..c7da5b6d84 100644
--- a/usr/src/lib/fm/topo/libtopo/common/topo_xml.c
+++ b/usr/src/lib/fm/topo/libtopo/common/topo_xml.c
@@ -930,7 +930,6 @@ topo_xml_walk(topo_mod_t *mp,
continue;
}
if ((rdp = tf_rdata_new(mp, xinfo, curr, troot)) == NULL) {
- tf_rdata_free(mp, rr);
/*
* Range processing error, continue walk
*/