Module Name: src
Committed By: pgoyette
Date: Sun Jul 17 02:48:07 UTC 2016
Modified Files:
src/sys/netsmb: smb_dev.c
Log Message:
Now that we're only calling devsw_attach() in the modular driver, it
is not ok for the driver/module to already exist. So don't ignore
EEXIST.
To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 src/sys/netsmb/smb_dev.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/netsmb/smb_dev.c
diff -u src/sys/netsmb/smb_dev.c:1.47 src/sys/netsmb/smb_dev.c:1.48
--- src/sys/netsmb/smb_dev.c:1.47 Sun Jul 17 00:33:28 2016
+++ src/sys/netsmb/smb_dev.c Sun Jul 17 02:48:07 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: smb_dev.c,v 1.47 2016/07/17 00:33:28 pgoyette Exp $ */
+/* $NetBSD: smb_dev.c,v 1.48 2016/07/17 02:48:07 pgoyette Exp $ */
/*
* Copyright (c) 2000-2001 Boris Popov
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: smb_dev.c,v 1.47 2016/07/17 00:33:28 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: smb_dev.c,v 1.48 2016/07/17 02:48:07 pgoyette Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -383,8 +383,6 @@ nsmb_modcmd(modcmd_t cmd, void *arg)
#ifdef _MODULE
error =
devsw_attach("nsmb", NULL, &bmajor, &nsmb_cdevsw, &cmajor);
- if (error == EEXIST) /* builtin */
- error = 0;
#endif
if (error) {
nsmbdetach();
