From aab83bb83be7342f6cfccaed8d5fe0b2f404855d Mon Sep 17 00:00:00 2001 From: Josef 'Jeff' Sipek Date: Wed, 24 Feb 2016 11:58:55 -0500 Subject: 6659 nvlist_free(NULL) is a no-op Reviewed by: Toomas Soome Reviewed by: Marcel Telka Approved by: Robert Mustacchi --- usr/src/uts/common/io/devfm.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'usr/src/uts/common/io/devfm.c') diff --git a/usr/src/uts/common/io/devfm.c b/usr/src/uts/common/io/devfm.c index 221338de7e..eb5e24079e 100644 --- a/usr/src/uts/common/io/devfm.c +++ b/usr/src/uts/common/io/devfm.c @@ -298,12 +298,10 @@ fm_ioctl(dev_t dev, int cmd, intptr_t data, int flag, cred_t *cred, int *rvalp) err = subr->func(cmd, invl, &onvl); - if (invl != NULL) - nvlist_free(invl); + nvlist_free(invl); if (err != 0) { - if (onvl != NULL) - nvlist_free(onvl); + nvlist_free(onvl); return (err); } @@ -425,8 +423,7 @@ _fini(void) int ret; if ((ret = mod_remove(&modlinkage)) == 0) { - if (fm_vers_nvl != NULL) - nvlist_free(fm_vers_nvl); + nvlist_free(fm_vers_nvl); } return (ret); -- cgit v1.2.3