Module Name: src
Committed By: pooka
Date: Mon Apr 12 22:29:11 UTC 2010
Modified Files:
src/sys/dev: fss.c
Log Message:
Ignore EEXIST from devsw_attach. This is not the optimal solution,
but it makes it possible to dynamically create device nodes for
fss before the fss module init runs by allowing to run devsw_attach
earlier.
To generate a diff of this commit:
cvs rdiff -u -r1.66 -r1.67 src/sys/dev/fss.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/dev/fss.c
diff -u src/sys/dev/fss.c:1.66 src/sys/dev/fss.c:1.67
--- src/sys/dev/fss.c:1.66 Mon Apr 5 09:30:46 2010
+++ src/sys/dev/fss.c Mon Apr 12 22:29:11 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: fss.c,v 1.66 2010/04/05 09:30:46 hannken Exp $ */
+/* $NetBSD: fss.c,v 1.67 2010/04/12 22:29:11 pooka Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fss.c,v 1.66 2010/04/05 09:30:46 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fss.c,v 1.67 2010/04/12 22:29:11 pooka Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1248,6 +1248,8 @@
}
error = devsw_attach(fss_cd.cd_name,
&fss_bdevsw, &bmajor, &fss_cdevsw, &cmajor);
+ if (error == EEXIST)
+ error = 0;
if (error) {
config_cfattach_detach(fss_cd.cd_name, &fss_ca);
config_cfdriver_detach(&fss_cd);
