summaryrefslogtreecommitdiff
path: root/sys/dev/sysmon/sysmon.c
diff options
context:
space:
mode:
authorpgoyette <pgoyette@NetBSD.org>2015-05-05 00:28:25 +0000
committerpgoyette <pgoyette@NetBSD.org>2015-05-05 00:28:25 +0000
commit8ad55debbe9bbdd5c5a165ae1df5d618d27fa071 (patch)
tree73a1064849e613efb23dafc3ad7bbd3968052747 /sys/dev/sysmon/sysmon.c
parented27294b49c1a0c924a9309ae7e7872cbe12a5e2 (diff)
If module_autoload() returns an error, just return that value instead
of overwriting with ENODEV. Thanks, christos!
Diffstat (limited to 'sys/dev/sysmon/sysmon.c')
-rw-r--r--sys/dev/sysmon/sysmon.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/sys/dev/sysmon/sysmon.c b/sys/dev/sysmon/sysmon.c
index b53cbb7a747..22d711f7319 100644
--- a/sys/dev/sysmon/sysmon.c
+++ b/sys/dev/sysmon/sysmon.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sysmon.c,v 1.26 2015/05/04 23:50:36 pgoyette Exp $ */
+/* $NetBSD: sysmon.c,v 1.27 2015/05/05 00:28:25 pgoyette Exp $ */
/*-
* Copyright (c) 2000 Zembu Labs, Inc.
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sysmon.c,v 1.26 2015/05/04 23:50:36 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sysmon.c,v 1.27 2015/05/05 00:28:25 pgoyette Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@@ -153,6 +153,8 @@ sysmonopen(dev_t dev, int flag, int mode, struct lwp *l)
error = module_autoload(sysmon_mod[minor(dev)],
MODULE_CLASS_MISC);
mutex_enter(&sysmon_minor_mtx);
+ if (error)
+ break;
if (sysmon_opvec_table[minor(dev)] == NULL) {
error = ENODEV;
break;