2 files changed, 15 insertions, 2 deletions

diff --git a/sys/dev/usb/ugen.c b/sys/dev/usb/ugen.c
index a5071a42923c2..2d433d4b60534 100644
--- a/sys/dev/usb/ugen.c
+++ b/sys/dev/usb/ugen.c
@@ -187,7 +187,13 @@ USB_ATTACH(ugen)
 	}
 
 #ifdef __FreeBSD__
-	cdevsw_add(&ugen_cdevsw);
+	{
+		static int global_init_done = 0;
+		if (!global_init_done) {
+			cdevsw_add(&ugen_cdevsw);
+			global_init_done = 1;
+		}
+	}
 #endif
 	USB_ATTACH_SUCCESS_RETURN;
 }
diff --git a/sys/dev/usb/uhid.c b/sys/dev/usb/uhid.c
index e2371bbac7b46..719341c853b68 100644
--- a/sys/dev/usb/uhid.c
+++ b/sys/dev/usb/uhid.c
@@ -231,7 +231,14 @@ USB_ATTACH(uhid)
 	sc->sc_repdesc_size = size;
 
 #ifdef __FreeBSD__
-	cdevsw_add(&uhid_cdevsw);
+	{
+		static int global_init_done = 0;
+
+		if (!global_init_done) {
+			cdevsw_add(&uhid_cdevsw);
+			global_init_done = 1;
+		}
+	}
 #endif
 	USB_ATTACH_SUCCESS_RETURN;
 }