9 files changed, 18 insertions, 1 deletions

diff --git a/sys/dev/usb/ucom.c b/sys/dev/usb/ucom.c
index ad0a3d1ec0997..4bea235f68a93 100644
--- a/sys/dev/usb/ucom.c
+++ b/sys/dev/usb/ucom.c
@@ -128,13 +128,14 @@ Static d_ioctl_t ucomioctl;
 
 
 static struct cdevsw ucom_cdevsw = {
+	.d_version =	D_VERSION,
 	.d_open =	ucomopen,
 	.d_close =	ucomclose,
 	.d_read =	ucomread,
 	.d_write =	ucomwrite,
 	.d_ioctl =	ucomioctl,
 	.d_name =	"ucom",
-	.d_flags =	D_TTY,
+	.d_flags =	D_TTY | D_NEEDGIANT,
 #if __FreeBSD_version < 500014
 	.d_bmaj =	-1,
 #endif
diff --git a/sys/dev/usb/ufm.c b/sys/dev/usb/ufm.c
index 26916f1f4f393..db008ea91eb45 100644
--- a/sys/dev/usb/ufm.c
+++ b/sys/dev/usb/ufm.c
@@ -89,6 +89,8 @@ d_close_t ufmclose;
 d_ioctl_t ufmioctl;
 
 Static struct cdevsw ufm_cdevsw = {
+	.d_version =	D_VERSION,
+	.d_flags =	D_NEEDGIANT,
 	.d_open =	ufmopen,
 	.d_close =	ufmclose,
 	.d_ioctl =	ufmioctl,
diff --git a/sys/dev/usb/ugen.c b/sys/dev/usb/ugen.c
index 408d14b06bdcb..a9074235254bf 100644
--- a/sys/dev/usb/ugen.c
+++ b/sys/dev/usb/ugen.c
@@ -151,6 +151,8 @@ d_poll_t  ugenpoll;
 
 
 Static struct cdevsw ugen_cdevsw = {
+	.d_version =	D_VERSION,
+	.d_flags =	D_NEEDGIANT,
 	.d_open =	ugenopen,
 	.d_close =	ugenclose,
 	.d_read =	ugenread,
diff --git a/sys/dev/usb/uhid.c b/sys/dev/usb/uhid.c
index ec46474a1c0b1..a574d1f0279f0 100644
--- a/sys/dev/usb/uhid.c
+++ b/sys/dev/usb/uhid.c
@@ -156,6 +156,8 @@ d_poll_t	uhidpoll;
 
 
 Static struct cdevsw uhid_cdevsw = {
+	.d_version =	D_VERSION,
+	.d_flags =	D_NEEDGIANT,
 	.d_open =	uhidopen,
 	.d_close =	uhidclose,
 	.d_read =	uhidread,
diff --git a/sys/dev/usb/ulpt.c b/sys/dev/usb/ulpt.c
index 3dadd00633f29..48aeb0956edcd 100644
--- a/sys/dev/usb/ulpt.c
+++ b/sys/dev/usb/ulpt.c
@@ -147,6 +147,8 @@ Static d_ioctl_t ulptioctl;
 
 
 Static struct cdevsw ulpt_cdevsw = {
+	.d_version =	D_VERSION,
+	.d_flags =	D_NEEDGIANT,
 	.d_open =	ulptopen,
 	.d_close =	ulptclose,
 	.d_write =	ulptwrite,
diff --git a/sys/dev/usb/ums.c b/sys/dev/usb/ums.c
index 4c0d598045da2..2104ee3b1d70e 100644
--- a/sys/dev/usb/ums.c
+++ b/sys/dev/usb/ums.c
@@ -154,6 +154,8 @@ Static d_poll_t  ums_poll;
 
 
 Static struct cdevsw ums_cdevsw = {
+	.d_version =	D_VERSION,
+	.d_flags =	D_NEEDGIANT,
 	.d_open =	ums_open,
 	.d_close =	ums_close,
 	.d_read =	ums_read,
diff --git a/sys/dev/usb/urio.c b/sys/dev/usb/urio.c
index 57979cdf3f38c..eaec4e5b1007a 100644
--- a/sys/dev/usb/urio.c
+++ b/sys/dev/usb/urio.c
@@ -117,6 +117,8 @@ d_ioctl_t urioioctl;
 
 
 Static struct cdevsw urio_cdevsw = {
+	.d_version =	D_VERSION,
+	.d_flags =	D_NEEDGIANT,
 	.d_open =	urioopen,
 	.d_close =	urioclose,
 	.d_read =	urioread,
diff --git a/sys/dev/usb/usb.c b/sys/dev/usb/usb.c
index 6ff8ed3e81e8e..44a554449b51b 100644
--- a/sys/dev/usb/usb.c
+++ b/sys/dev/usb/usb.c
@@ -146,6 +146,8 @@ d_ioctl_t usbioctl;
 d_poll_t usbpoll;
 
 struct cdevsw usb_cdevsw = {
+	.d_version =	D_VERSION,
+	.d_flags =	D_NEEDGIANT,
 	.d_open =	usbopen,
 	.d_close =	usbclose,
 	.d_read =	usbread,
diff --git a/sys/dev/usb/uscanner.c b/sys/dev/usb/uscanner.c
index ab46721c113a7..02b8e0e5e7868 100644
--- a/sys/dev/usb/uscanner.c
+++ b/sys/dev/usb/uscanner.c
@@ -268,6 +268,8 @@ d_poll_t  uscannerpoll;
 
 
 Static struct cdevsw uscanner_cdevsw = {
+	.d_version =	D_VERSION,
+	.d_flags =	D_NEEDGIANT,
 	.d_open =	uscanneropen,
 	.d_close =	uscannerclose,
 	.d_read =	uscannerread,