summaryrefslogtreecommitdiff
path: root/usr/src/uts/common/io/inotify.c
diff options
context:
space:
mode:
authorJohn Levon <john.levon@joyent.com>2019-08-27 21:56:50 +0000
committerJohn Levon <john.levon@joyent.com>2019-08-28 08:58:06 +0000
commitfa1252de73f343f36bf1e6f366902ba96c480aaa (patch)
treec5e3ad394bfba6fc3f094c050ca250897ce56a4b /usr/src/uts/common/io/inotify.c
parentdf3850281ea4def494e12172cae5a6181823c77d (diff)
downloadillumos-joyent-fa1252de73f343f36bf1e6f366902ba96c480aaa.tar.gz
OS-7960 need fixes for NULL as a pointer
Reviewed by: Jerry Jelinek <jerry.jelinek@joyent.com> Reviewed by: Ryan Zezeski <rpz@joyent.com> Reviewed by: Robert Mustacchi <rm@joyent.com> Approved by: Robert Mustacchi <rm@joyent.com>
Diffstat (limited to 'usr/src/uts/common/io/inotify.c')
-rw-r--r--usr/src/uts/common/io/inotify.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/usr/src/uts/common/io/inotify.c b/usr/src/uts/common/io/inotify.c
index eaa0c33f0f..b20c63481f 100644
--- a/usr/src/uts/common/io/inotify.c
+++ b/usr/src/uts/common/io/inotify.c
@@ -10,7 +10,7 @@
*/
/*
- * Copyright 2017 Joyent, Inc.
+ * Copyright 2019 Joyent, Inc.
* Copyright (c) 2015 The MathWorks, Inc. All rights reserved.
*/
@@ -1121,7 +1121,7 @@ inotify_open(dev_t *devp, int flag, int otyp, cred_t *cred_p)
if (ddi_soft_state_zalloc(inotify_softstate, minor) != DDI_SUCCESS) {
vmem_free(inotify_minor, (void *)(uintptr_t)minor, 1);
mutex_exit(&inotify_lock);
- return (NULL);
+ return (EINVAL);
}
state = ddi_get_soft_state(inotify_softstate, minor);
@@ -1414,7 +1414,7 @@ inotify_attach(dev_info_t *devi, ddi_attach_cmd_t cmd)
}
if (ddi_create_minor_node(devi, "inotify", S_IFCHR,
- INOTIFYMNRN_INOTIFY, DDI_PSEUDO, NULL) == DDI_FAILURE) {
+ INOTIFYMNRN_INOTIFY, DDI_PSEUDO, 0) == DDI_FAILURE) {
cmn_err(CE_NOTE, "/dev/inotify couldn't create minor node");
ddi_soft_state_fini(&inotify_softstate);
mutex_exit(&inotify_lock);