diff options
| author | Richard Lowe <richlowe@richlowe.net> | 2022-02-22 18:00:48 -0600 |
|---|---|---|
| committer | Richard Lowe <richlowe@richlowe.net> | 2022-02-22 18:00:48 -0600 |
| commit | 3971085411b91c5d82e278443ab68fca1946cb21 (patch) | |
| tree | 8e6d01d8aea1c3d8179a47b929ff5bfa8b42f752 /usr/src/uts/common/os/sunddi.c | |
| parent | 1df45418ec3688847e142a9a2213965459ff39c7 (diff) | |
| parent | ca783257c986cddcc674ae22916a6766b98a2d36 (diff) | |
| download | illumos-joyent-3971085411b91c5d82e278443ab68fca1946cb21.tar.gz | |
Merge branch 'master' of https://github.com/illumos/illumos-gate into man/big-reorg
# Conflicts:
# usr/src/cmd/fmthard/fmthard.c
# usr/src/cmd/zoneadmd/zcons.c
# usr/src/man/man2/chmod.2
# usr/src/man/man2/close.2
# usr/src/man/man2/open.2
# usr/src/man/man3c/grantpt.3c
# usr/src/man/man3c/posix_openpt.3c
# usr/src/man/man3c/ptsname.3c
# usr/src/man/man3c/unlockpt.3c
# usr/src/man/man3utempter/utempter_add_record.3utempter
# usr/src/man/man4/Makefile
# usr/src/man/man4d/ptm.4d
# usr/src/man/man4d/pts.4d
# usr/src/man/man4d/pty.4d
# usr/src/man/man4d/zcons.4d
# usr/src/man/man4m/pckt.4m
# usr/src/man/man4m/ptem.4m
# usr/src/man/man4p/vxlan.7p
# usr/src/man/man5/Makefile
# usr/src/man/man5/bhyve_config.5
# usr/src/man/man7d/Makefile
# usr/src/man/man7p/Makefile
# usr/src/man/man8/bhyve.8
# usr/src/man/man8/dladm.8
# usr/src/man/man8/flowadm.8
# usr/src/man/man8/fmthard.8
# usr/src/man/man8/in.rlogind.8
# usr/src/man/man8/in.telnetd.8
# usr/src/man/man8/nvmeadm.8
# usr/src/man/man8/pppd.8
# usr/src/pkg/manifests/SUNWcs.man4d.inc
# usr/src/uts/common/io/zcons.c
Diffstat (limited to 'usr/src/uts/common/os/sunddi.c')
| -rw-r--r-- | usr/src/uts/common/os/sunddi.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/usr/src/uts/common/os/sunddi.c b/usr/src/uts/common/os/sunddi.c index 4df2b7e55f..06ade6cc58 100644 --- a/usr/src/uts/common/os/sunddi.c +++ b/usr/src/uts/common/os/sunddi.c @@ -2813,7 +2813,7 @@ ddi_prop_int64_op(prop_handle_t *ph, uint_t cmd, int64_t *data) */ ph->ph_cur_pos = (uchar_t *)ph->ph_cur_pos + sizeof (int64_t); - return (DDI_PROP_RESULT_OK); + return (DDI_PROP_RESULT_OK); case DDI_PROP_CMD_ENCODE: /* @@ -2861,7 +2861,7 @@ ddi_prop_int64_op(prop_handle_t *ph, uint_t cmd, int64_t *data) */ ph->ph_cur_pos = (uchar_t *)ph->ph_cur_pos + sizeof (int64_t); - return (DDI_PROP_RESULT_OK); + return (DDI_PROP_RESULT_OK); case DDI_PROP_CMD_GET_ESIZE: /* @@ -9827,7 +9827,7 @@ e_ddi_branch_unconfigure( /* The dip still exists, so do a hold */ e_ddi_branch_hold(rdip); } -out: + kmem_free(devnm, MAXNAMELEN + 1); ndi_devi_exit(pdip, circ); return (ndi2errno(rv)); |