diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2016-02-29 12:17:08 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2016-02-29 12:17:08 +0000 |
| commit | 67c3f4c9f70c40ce0dd12db8804e720c3a0c0c79 (patch) | |
| tree | a3220c2c4058a61e04dd53a843726a6dd4266a54 /usr/src/uts/common/io/devfm.c | |
| parent | e5490f12d073ec144d62bc50456b750256cc7c0a (diff) | |
| parent | aab83bb83be7342f6cfccaed8d5fe0b2f404855d (diff) | |
| download | illumos-joyent-67c3f4c9f70c40ce0dd12db8804e720c3a0c0c79.tar.gz | |
[illumos-gate merge]
commit aab83bb83be7342f6cfccaed8d5fe0b2f404855d
6659 nvlist_free(NULL) is a no-op
commit d643a855cbd8c4fb4fe966406fa05dff70673597
6674 sys/isa_defs.h shouldn't unconditionally define _ILP32
commit bcf23f43dc1b73080eeded927585ee86feab40a7
6596 Macro redefined in strtolctype.h
Diffstat (limited to 'usr/src/uts/common/io/devfm.c')
| -rw-r--r-- | usr/src/uts/common/io/devfm.c | 9 |
1 files changed, 3 insertions, 6 deletions
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); |