diff options
| author | Toomas Soome <tsoome@me.com> | 2020-04-11 20:32:09 +0300 |
|---|---|---|
| committer | Toomas Soome <tsoome@me.com> | 2020-05-10 10:49:45 +0300 |
| commit | 47a041a028740925012faeaf8aa122cb53545a4a (patch) | |
| tree | 8b366291cb7aa3f508ae20007951016143269bb3 /usr | |
| parent | fccee7da6a96828fd0fd19c6b32fe901e6b31549 (diff) | |
| download | illumos-joyent-47a041a028740925012faeaf8aa122cb53545a4a.tar.gz | |
12614 todds1287: NULL pointer errors
Reviewed by: Gergő Doma <domag02@gmail.com>
Reviewed by: Andrew Stormont <andyjstormont@gmail.com>
Reviewed by: Peter Tribble <peter.tribble@gmail.com>
Reviewed by: Yuri Pankov <ypankov@fastmail.com>
Approved by: Gordon Ross <gordon.w.ross@gmail.com>
Diffstat (limited to 'usr')
| -rw-r--r-- | usr/src/uts/sun4u/io/todds1287.c | 6 | ||||
| -rw-r--r-- | usr/src/uts/sun4u/todds1287/Makefile | 21 |
2 files changed, 3 insertions, 24 deletions
diff --git a/usr/src/uts/sun4u/io/todds1287.c b/usr/src/uts/sun4u/io/todds1287.c index 35dc7ad8fc..bf9cb8bd42 100644 --- a/usr/src/uts/sun4u/io/todds1287.c +++ b/usr/src/uts/sun4u/io/todds1287.c @@ -176,7 +176,7 @@ static ddi_softintr_t ds1287_softintr_id; static kmutex_t ds1287_reg_mutex; /* Protects ds1287 Registers */ static struct modldrv modldrv = { - &mod_driverops, /* Type of module. This one is a driver */ + &mod_driverops, /* Type of module. This one is a driver */ "ds1287 clock driver", /* Name of the module. */ &ds1287_ops, /* driver ops */ }; @@ -354,7 +354,7 @@ ds1287_attach(dev_info_t *dip, ddi_attach_cmd_t cmd) * creating the minor node. */ if (ddi_create_minor_node(dip, "power_button", S_IFCHR, - (instance << 8) + 0, "ddi_power_button", NULL) == DDI_FAILURE) { + (instance << 8) + 0, "ddi_power_button", 0) == DDI_FAILURE) { cmn_err(CE_WARN, "ds1287_attach: Failed to create minor node"); goto error3; } @@ -453,7 +453,7 @@ ds1287_close(dev_t dev, int flags, int otyp, cred_t *credp) /*ARGSUSED4*/ static int ds1287_ioctl(dev_t dev, int cmd, intptr_t arg, int mode, - cred_t *credp, int *rvalp) + cred_t *credp, int *rvalp) { struct ds1287 *softsp; int clone; diff --git a/usr/src/uts/sun4u/todds1287/Makefile b/usr/src/uts/sun4u/todds1287/Makefile index ee0d883bc9..df904ac01e 100644 --- a/usr/src/uts/sun4u/todds1287/Makefile +++ b/usr/src/uts/sun4u/todds1287/Makefile @@ -40,7 +40,6 @@ UTSBASE = ../.. # MODULE = todds1287 OBJECTS = $(TODDS1287_OBJS:%=$(OBJS_DIR)/%) -LINTS = $(TODDS1287_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_PSM_TOD_DIR)/$(MODULE) # @@ -52,21 +51,8 @@ include $(UTSBASE)/sun4u/Makefile.sun4u # Define targets # ALL_TARGET = $(BINARY) -LINT_TARGET = $(MODULE).lint INSTALL_TARGET = $(BINARY) $(ROOTMODULE) -# -# lint pass one enforcement -# -CFLAGS += $(CCVERBOSE) - -# -# For now, disable these lint checks; maintainers should endeavor -# to investigate and remove these for maximum lint coverage. -# Please do not carry these forward to new Makefiles. -# -LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN - CERRWARN += $(CNOWARN_UNINIT) # @@ -82,16 +68,9 @@ clean: $(CLEAN_DEPS) clobber: $(CLOBBER_DEPS) -lint: $(LINT_DEPS) - -modlintlib: $(MODLINTLIB_DEPS) - -clean.lint: $(CLEAN_LINT_DEPS) - install: $(INSTALL_DEPS) # # Include common targets. # include $(UTSBASE)/sun4u/Makefile.targ - |