In a drivers activate() entry point, if on DVACT_DEACTIVATE it does

something, then it MUST return zero on DVACT_ACTIVATE, not EOPNOTSUPP;
this very popular bug has been cut and pasted a lot of times...
ok deraadt@ mickey@

53 files changed, 83 insertions, 109 deletions

diff --git a/sys/dev/audio.c b/sys/dev/audio.c
index 69d15fdb1da..d2af628802c 100644
--- a/sys/dev/audio.c
+++ b/sys/dev/audio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: audio.c,v 1.50 2006/05/29 20:23:13 miod Exp $	*/
+/*	$OpenBSD: audio.c,v 1.51 2006/06/23 06:27:11 miod Exp $	*/
 /*	$NetBSD: audio.c,v 1.119 1999/11/09 16:50:47 augustss Exp $	*/
 
 /*
@@ -343,7 +343,6 @@ audioactivate(self, act)
 
 	switch (act) {
 	case DVACT_ACTIVATE:
-		return (EOPNOTSUPP);
 		break;
 
 	case DVACT_DEACTIVATE:
diff --git a/sys/dev/gpio/gpioow.c b/sys/dev/gpio/gpioow.c
index 94364133eef..23adb2fc6f8 100644
--- a/sys/dev/gpio/gpioow.c
+++ b/sys/dev/gpio/gpioow.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: gpioow.c,v 1.1 2006/03/04 16:27:03 grange Exp $	*/
+/*	$OpenBSD: gpioow.c,v 1.2 2006/06/23 06:27:11 miod Exp $	*/
 
 /*
  * Copyright (c) 2006 Alexander Yurchenko <grange@openbsd.org>
@@ -171,7 +171,7 @@ gpioow_activate(struct device *self, enum devact act)
 
 	switch (act) {
 	case DVACT_ACTIVATE:
-		return (EOPNOTSUPP);
+		break;
 	case DVACT_DEACTIVATE:
 		sc->sc_dying = 1;
 		if (sc->sc_ow_dev != NULL)
diff --git a/sys/dev/ic/ath.c b/sys/dev/ic/ath.c
index 16f5587cbf6..d6f8deae5a1 100644
--- a/sys/dev/ic/ath.c
+++ b/sys/dev/ic/ath.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: ath.c,v 1.50 2006/05/22 20:35:12 krw Exp $  */
+/*      $OpenBSD: ath.c,v 1.51 2006/06/23 06:27:11 miod Exp $  */
 /*	$NetBSD: ath.c,v 1.37 2004/08/18 21:59:39 dyoung Exp $	*/
 
 /*-
@@ -172,7 +172,6 @@ ath_activate(struct device *self, enum devact act)
 	s = splnet();
 	switch (act) {
 	case DVACT_ACTIVATE:
-		rv = EOPNOTSUPP;
 		break;
 	case DVACT_DEACTIVATE:
 		if_deactivate(&sc->sc_ic.ic_if);
diff --git a/sys/dev/ic/atw.c b/sys/dev/ic/atw.c
index 3a6ee80f30b..2adea26dd3f 100644
--- a/sys/dev/ic/atw.c
+++ b/sys/dev/ic/atw.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: atw.c,v 1.46 2006/05/22 20:35:12 krw Exp $	*/
+/*	$OpenBSD: atw.c,v 1.47 2006/06/23 06:27:11 miod Exp $	*/
 /*	$NetBSD: atw.c,v 1.69 2004/07/23 07:07:55 dyoung Exp $	*/
 
 /*-
@@ -324,7 +324,6 @@ atw_activate(struct device *self, enum devact act)
 	s = splnet();
 	switch (act) {
 	case DVACT_ACTIVATE:
-		rv = EOPNOTSUPP;
 		break;
 
 	case DVACT_DEACTIVATE:
diff --git a/sys/dev/ic/awi.c b/sys/dev/ic/awi.c
index ddd410b227b..91959f0e9ac 100644
--- a/sys/dev/ic/awi.c
+++ b/sys/dev/ic/awi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: awi.c,v 1.21 2006/03/25 22:41:42 djm Exp $	*/
+/*	$OpenBSD: awi.c,v 1.22 2006/06/23 06:27:11 miod Exp $	*/
 /*	$NetBSD: awi.c,v 1.26 2000/07/21 04:48:55 onoe Exp $	*/
 
 /*-
@@ -414,7 +414,6 @@ awi_activate(self, act)
 	s = splnet();
 	switch (act) {
 	case DVACT_ACTIVATE:
-		error = EOPNOTSUPP;
 		break;
 
 	case DVACT_DEACTIVATE:
diff --git a/sys/dev/ic/com.c b/sys/dev/ic/com.c
index 3d10dfaae21..48511d60c88 100644
--- a/sys/dev/ic/com.c
+++ b/sys/dev/ic/com.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: com.c,v 1.111 2006/04/27 19:31:44 deraadt Exp $	*/
+/*	$OpenBSD: com.c,v 1.112 2006/06/23 06:27:11 miod Exp $	*/
 /*	$NetBSD: com.c,v 1.82.4.1 1996/06/02 09:08:00 mrg Exp $	*/
 
 /*
@@ -249,7 +249,6 @@ com_activate(self, act)
 	s = spltty();
 	switch (act) {
 	case DVACT_ACTIVATE:
-		rv = EOPNOTSUPP;
 		break;
 
 	case DVACT_DEACTIVATE:
diff --git a/sys/dev/ic/smc91cxx.c b/sys/dev/ic/smc91cxx.c
index df65a19d538..1f7463b0c16 100644
--- a/sys/dev/ic/smc91cxx.c
+++ b/sys/dev/ic/smc91cxx.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: smc91cxx.c,v 1.25 2006/06/17 17:56:10 brad Exp $	*/
+/*	$OpenBSD: smc91cxx.c,v 1.26 2006/06/23 06:27:11 miod Exp $	*/
 /*	$NetBSD: smc91cxx.c,v 1.11 1998/08/08 23:51:41 mycroft Exp $	*/
 
 /*-
@@ -1235,7 +1235,6 @@ smc91cxx_activate(self, act)
 	s = splnet();
 	switch (act) {
 	case DVACT_ACTIVATE:
-		rv = EOPNOTSUPP;
 		break;
 
 	case DVACT_DEACTIVATE:
diff --git a/sys/dev/onewire/owid.c b/sys/dev/onewire/owid.c
index 21fdb9e8b3c..38d2b1fe72b 100644
--- a/sys/dev/onewire/owid.c
+++ b/sys/dev/onewire/owid.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: owid.c,v 1.1 2006/03/04 16:27:03 grange Exp $	*/
+/*	$OpenBSD: owid.c,v 1.2 2006/06/23 06:27:11 miod Exp $	*/
 
 /*
  * Copyright (c) 2006 Alexander Yurchenko <grange@openbsd.org>
@@ -107,7 +107,7 @@ owid_activate(struct device *self, enum devact act)
 
 	switch (act) {
 	case DVACT_ACTIVATE:
-		return (EOPNOTSUPP);
+		break;
 	case DVACT_DEACTIVATE:
 		sc->sc_dying = 1;
 		break;
diff --git a/sys/dev/onewire/owtemp.c b/sys/dev/onewire/owtemp.c
index 1fd5b673881..1388040c80d 100644
--- a/sys/dev/onewire/owtemp.c
+++ b/sys/dev/onewire/owtemp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: owtemp.c,v 1.1 2006/03/04 16:27:03 grange Exp $	*/
+/*	$OpenBSD: owtemp.c,v 1.2 2006/06/23 06:27:11 miod Exp $	*/
 
 /*
  * Copyright (c) 2006 Alexander Yurchenko <grange@openbsd.org>
@@ -117,7 +117,7 @@ owtemp_activate(struct device *self, enum devact act)
 
 	switch (act) {
 	case DVACT_ACTIVATE:
-		return (EOPNOTSUPP);
+		break;
 	case DVACT_DEACTIVATE:
 		sc->sc_dying = 1;
 		break;
diff --git a/sys/dev/pci/azalia.c b/sys/dev/pci/azalia.c
index de94553d164..65f8e9a923f 100644
--- a/sys/dev/pci/azalia.c
+++ b/sys/dev/pci/azalia.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: azalia.c,v 1.16 2006/06/21 05:17:48 brad Exp $	*/
+/*	$OpenBSD: azalia.c,v 1.17 2006/06/23 06:27:11 miod Exp $	*/
 /*	$NetBSD: azalia.c,v 1.20 2006/05/07 08:31:44 kent Exp $	*/
 
 /*-
@@ -412,7 +412,7 @@ azalia_pci_activate(struct device *self, enum devact act)
 	ret = 0;
 	switch (act) {
 	case DVACT_ACTIVATE:
-		return EOPNOTSUPP;
+		return ret;
 	case DVACT_DEACTIVATE:
 		if (sc->audiodev != NULL)
 			ret = config_deactivate(sc->audiodev);
diff --git a/sys/dev/radio.c b/sys/dev/radio.c
index bbea6d5bce7..e893c892db7 100644
--- a/sys/dev/radio.c
+++ b/sys/dev/radio.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: radio.c,v 1.6 2002/05/30 15:22:26 mickey Exp $ */
+/* $OpenBSD: radio.c,v 1.7 2006/06/23 06:27:11 miod Exp $ */
 /* $RuOBSD: radio.c,v 1.7 2001/12/04 06:03:05 tm Exp $ */
 
 /*
@@ -196,7 +196,6 @@ radioactivate(struct device *self, enum devact act)
 
 	switch (act) {
 	case DVACT_ACTIVATE:
-		return (EOPNOTSUPP);
 		break;
 
 	case DVACT_DEACTIVATE:
diff --git a/sys/dev/usb/ehci.c b/sys/dev/usb/ehci.c
index 809c06f6ebc..9dd1cdaddf3 100644
--- a/sys/dev/usb/ehci.c
+++ b/sys/dev/usb/ehci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ehci.c,v 1.60 2006/05/31 07:27:28 dlg Exp $ */
+/*	$OpenBSD: ehci.c,v 1.61 2006/06/23 06:27:11 miod Exp $ */
 /*	$NetBSD: ehci.c,v 1.66 2004/06/30 03:11:56 mycroft Exp $	*/
 
 /*
@@ -922,7 +922,7 @@ ehci_activate(device_ptr_t self, enum devact act)
 
 	switch (act) {
 	case DVACT_ACTIVATE:
-		return (EOPNOTSUPP);
+		break;
 
 	case DVACT_DEACTIVATE:
 		if (sc->sc_child != NULL)
diff --git a/sys/dev/usb/if_atu.c b/sys/dev/usb/if_atu.c
index ead1de972c8..c1006001207 100644
--- a/sys/dev/usb/if_atu.c
+++ b/sys/dev/usb/if_atu.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_atu.c,v 1.71 2006/06/19 16:03:19 mk Exp $ */
+/*	$OpenBSD: if_atu.c,v 1.72 2006/06/23 06:27:11 miod Exp $ */
 /*
  * Copyright (c) 2003, 2004
  *	Daan Vreeken <Danovitsch@Vitsch.net>.  All rights reserved.
@@ -1515,7 +1515,6 @@ atu_activate(device_ptr_t self, enum devact act)
 
 	switch (act) {
 	case DVACT_ACTIVATE:
-		return (EOPNOTSUPP);
 		break;
 	case DVACT_DEACTIVATE:
 		if (sc->sc_state != ATU_S_UNCONFIG) {
diff --git a/sys/dev/usb/if_aue.c b/sys/dev/usb/if_aue.c
index 4f5f15f669f..b83b614701f 100644
--- a/sys/dev/usb/if_aue.c
+++ b/sys/dev/usb/if_aue.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_aue.c,v 1.47 2006/05/22 20:35:12 krw Exp $ */
+/*	$OpenBSD: if_aue.c,v 1.48 2006/06/23 06:27:11 miod Exp $ */
 /*	$NetBSD: if_aue.c,v 1.82 2003/03/05 17:37:36 shiba Exp $	*/
 /*
  * Copyright (c) 1997, 1998, 1999, 2000
@@ -920,7 +920,6 @@ aue_activate(device_ptr_t self, enum devact act)
 
 	switch (act) {
 	case DVACT_ACTIVATE:
-		return (EOPNOTSUPP);
 		break;
 
 	case DVACT_DEACTIVATE:
diff --git a/sys/dev/usb/if_axe.c b/sys/dev/usb/if_axe.c
index fc44a7e4a6e..49242edaeb0 100644
--- a/sys/dev/usb/if_axe.c
+++ b/sys/dev/usb/if_axe.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_axe.c,v 1.52 2006/06/01 04:27:02 pascoe Exp $	*/
+/*	$OpenBSD: if_axe.c,v 1.53 2006/06/23 06:27:11 miod Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998, 1999, 2000-2003
@@ -785,7 +785,6 @@ axe_activate(device_ptr_t self, enum devact act)
 
 	switch (act) {
 	case DVACT_ACTIVATE:
-		return (EOPNOTSUPP);
 		break;
 
 	case DVACT_DEACTIVATE:
diff --git a/sys/dev/usb/if_cdce.c b/sys/dev/usb/if_cdce.c
index 16d443052c3..ecc1a4d11bf 100644
--- a/sys/dev/usb/if_cdce.c
+++ b/sys/dev/usb/if_cdce.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_cdce.c,v 1.18 2006/05/30 22:51:53 pascoe Exp $ */
+/*	$OpenBSD: if_cdce.c,v 1.19 2006/06/23 06:27:11 miod Exp $ */
 
 /*
  * Copyright (c) 1997, 1998, 1999, 2000-2003 Bill Paul <wpaul@windriver.com>
@@ -768,7 +768,6 @@ cdce_activate(device_ptr_t self, enum devact act)
 
 	switch (act) {
 	case DVACT_ACTIVATE:
-		return (EOPNOTSUPP);
 		break;
 
 	case DVACT_DEACTIVATE:
diff --git a/sys/dev/usb/if_cue.c b/sys/dev/usb/if_cue.c
index 5e36c6cc19f..96657878929 100644
--- a/sys/dev/usb/if_cue.c
+++ b/sys/dev/usb/if_cue.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_cue.c,v 1.30 2006/03/25 22:41:47 djm Exp $ */
+/*	$OpenBSD: if_cue.c,v 1.31 2006/06/23 06:27:11 miod Exp $ */
 /*	$NetBSD: if_cue.c,v 1.40 2002/07/11 21:14:26 augustss Exp $	*/
 /*
  * Copyright (c) 1997, 1998, 1999, 2000
@@ -622,7 +622,6 @@ cue_activate(device_ptr_t self, enum devact act)
 
 	switch (act) {
 	case DVACT_ACTIVATE:
-		return (EOPNOTSUPP);
 		break;
 
 	case DVACT_DEACTIVATE:
diff --git a/sys/dev/usb/if_kue.c b/sys/dev/usb/if_kue.c
index 2fdc2160498..40c73d80b59 100644
--- a/sys/dev/usb/if_kue.c
+++ b/sys/dev/usb/if_kue.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_kue.c,v 1.41 2006/03/25 22:41:47 djm Exp $ */
+/*	$OpenBSD: if_kue.c,v 1.42 2006/06/23 06:27:11 miod Exp $ */
 /*	$NetBSD: if_kue.c,v 1.50 2002/07/16 22:00:31 augustss Exp $	*/
 /*
  * Copyright (c) 1997, 1998, 1999, 2000
@@ -614,7 +614,6 @@ kue_activate(device_ptr_t self, enum devact act)
 
 	switch (act) {
 	case DVACT_ACTIVATE:
-		return (EOPNOTSUPP);
 		break;
 
 	case DVACT_DEACTIVATE:
diff --git a/sys/dev/usb/if_ral.c b/sys/dev/usb/if_ral.c
index fab7af4d47c..dfb4c485f1f 100644
--- a/sys/dev/usb/if_ral.c
+++ b/sys/dev/usb/if_ral.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ral.c,v 1.69 2006/06/17 19:07:19 damien Exp $  */
+/*	$OpenBSD: if_ral.c,v 1.70 2006/06/23 06:27:11 miod Exp $  */
 
 /*-
  * Copyright (c) 2005, 2006
@@ -2246,7 +2246,7 @@ ural_activate(device_ptr_t self, enum devact act)
 {
 	switch (act) {
 	case DVACT_ACTIVATE:
-		return EOPNOTSUPP;
+		break;
 
 	case DVACT_DEACTIVATE:
 		/*if_deactivate(&sc->sc_ic.ic_if);*/
diff --git a/sys/dev/usb/if_udav.c b/sys/dev/usb/if_udav.c
index 882cfe31b25..f2f22041db8 100644
--- a/sys/dev/usb/if_udav.c
+++ b/sys/dev/usb/if_udav.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_udav.c,v 1.17 2006/03/25 22:41:47 djm Exp $ */
+/*	$OpenBSD: if_udav.c,v 1.18 2006/06/23 06:27:11 miod Exp $ */
 /*	$NetBSD: if_udav.c,v 1.3 2004/04/23 17:25:25 itojun Exp $	*/
 /*	$nabe: if_udav.c,v 1.3 2003/08/21 16:57:19 nabe Exp $	*/
 /*
@@ -718,7 +718,6 @@ udav_activate(device_ptr_t self, enum devact act)
 		 __func__, act));
 	switch (act) {
 	case DVACT_ACTIVATE:
-		return (EOPNOTSUPP);
 		break;
 
 	case DVACT_DEACTIVATE:
diff --git a/sys/dev/usb/if_upl.c b/sys/dev/usb/if_upl.c
index db109275a25..5ff49b21d88 100644
--- a/sys/dev/usb/if_upl.c
+++ b/sys/dev/usb/if_upl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_upl.c,v 1.24 2006/03/25 22:41:47 djm Exp $ */
+/*	$OpenBSD: if_upl.c,v 1.25 2006/06/23 06:27:11 miod Exp $ */
 /*	$NetBSD: if_upl.c,v 1.19 2002/07/11 21:14:26 augustss Exp $	*/
 /*
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -382,7 +382,6 @@ upl_activate(device_ptr_t self, enum devact act)
 
 	switch (act) {
 	case DVACT_ACTIVATE:
-		return (EOPNOTSUPP);
 		break;
 
 	case DVACT_DEACTIVATE:
diff --git a/sys/dev/usb/if_url.c b/sys/dev/usb/if_url.c
index 19a22eef9a4..f4fbe1e2429 100644
--- a/sys/dev/usb/if_url.c
+++ b/sys/dev/usb/if_url.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_url.c,v 1.31 2006/03/25 22:41:47 djm Exp $ */
+/*	$OpenBSD: if_url.c,v 1.32 2006/06/23 06:27:11 miod Exp $ */
 /*	$NetBSD: if_url.c,v 1.6 2002/09/29 10:19:21 martin Exp $	*/
 /*
  * Copyright (c) 2001, 2002
@@ -632,7 +632,6 @@ url_activate(device_ptr_t self, enum devact act)
 
 	switch (act) {
 	case DVACT_ACTIVATE:
-		return (EOPNOTSUPP);
 		break;
 
 	case DVACT_DEACTIVATE:
diff --git a/sys/dev/usb/if_wi_usb.c b/sys/dev/usb/if_wi_usb.c
index e6afef84fdb..169ae7f1dea 100644
--- a/sys/dev/usb/if_wi_usb.c
+++ b/sys/dev/usb/if_wi_usb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_wi_usb.c,v 1.29 2006/02/06 17:29:11 jmc Exp $ */
+/*	$OpenBSD: if_wi_usb.c,v 1.30 2006/06/23 06:27:11 miod Exp $ */
 
 /*
  * Copyright (c) 2003 Dale Rahn. All rights reserved.
@@ -1339,7 +1339,6 @@ wi_usb_activate(device_ptr_t self, enum devact act)
 
 	switch (act) {
 	case DVACT_ACTIVATE:
-		return (EOPNOTSUPP);
 		break;
 
 	case DVACT_DEACTIVATE:
diff --git a/sys/dev/usb/ohci.c b/sys/dev/usb/ohci.c
index fbcc074bf6a..e5f1f55e477 100644
--- a/sys/dev/usb/ohci.c
+++ b/sys/dev/usb/ohci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ohci.c,v 1.72 2006/05/31 06:18:09 pascoe Exp $ */
+/*	$OpenBSD: ohci.c,v 1.73 2006/06/23 06:27:11 miod Exp $ */
 /*	$NetBSD: ohci.c,v 1.139 2003/02/22 05:24:16 tsutsui Exp $	*/
 /*	$FreeBSD: src/sys/dev/usb/ohci.c,v 1.22 1999/11/17 22:33:40 n_hibma Exp $	*/
 
@@ -318,7 +318,7 @@ ohci_activate(device_ptr_t self, enum devact act)
 
 	switch (act) {
 	case DVACT_ACTIVATE:
-		return (EOPNOTSUPP);
+		break;
 
 	case DVACT_DEACTIVATE:
 		if (sc->sc_child != NULL)
diff --git a/sys/dev/usb/uaudio.c b/sys/dev/usb/uaudio.c
index ce22e9f5184..ceb52a64de3 100644
--- a/sys/dev/usb/uaudio.c
+++ b/sys/dev/usb/uaudio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uaudio.c,v 1.36 2006/05/04 15:25:10 mickey Exp $ */
+/*	$OpenBSD: uaudio.c,v 1.37 2006/06/23 06:27:11 miod Exp $ */
 /*	$NetBSD: uaudio.c,v 1.90 2004/10/29 17:12:53 kent Exp $	*/
 
 /*
@@ -483,7 +483,7 @@ uaudio_activate(device_ptr_t self, enum devact act)
 
 	switch (act) {
 	case DVACT_ACTIVATE:
-		return (EOPNOTSUPP);
+		break;
 	case DVACT_DEACTIVATE:
 		if (sc->sc_audiodev != NULL)
 			rv = config_deactivate(sc->sc_audiodev);
diff --git a/sys/dev/usb/ubsa.c b/sys/dev/usb/ubsa.c
index 92f60602c39..3f9287f7703 100644
--- a/sys/dev/usb/ubsa.c
+++ b/sys/dev/usb/ubsa.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ubsa.c,v 1.14 2006/02/11 09:33:45 brad Exp $ 	*/
+/*	$OpenBSD: ubsa.c,v 1.15 2006/06/23 06:27:11 miod Exp $ 	*/
 /*	$NetBSD: ubsa.c,v 1.5 2002/11/25 00:51:33 fvdl Exp $	*/
 /*-
  * Copyright (c) 2002, Alexander Kabaev <kan.FreeBSD.org>.
@@ -420,7 +420,7 @@ ubsa_activate(device_ptr_t self, enum devact act)
 
 	switch (act) {
 	case DVACT_ACTIVATE:
-		return (EOPNOTSUPP);
+		break;
 
 	case DVACT_DEACTIVATE:
 		if (sc->sc_subdev != NULL)
diff --git a/sys/dev/usb/ucom.c b/sys/dev/usb/ucom.c
index d67600d2c7f..e9823e206f6 100644
--- a/sys/dev/usb/ucom.c
+++ b/sys/dev/usb/ucom.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ucom.c,v 1.29 2006/04/27 19:31:44 deraadt Exp $ */
+/*	$OpenBSD: ucom.c,v 1.30 2006/06/23 06:27:11 miod Exp $ */
 /*	$NetBSD: ucom.c,v 1.49 2003/01/01 00:10:25 thorpej Exp $	*/
 
 /*
@@ -257,7 +257,7 @@ ucom_activate(device_ptr_t self, enum devact act)
 
 	switch (act) {
 	case DVACT_ACTIVATE:
-		return (EOPNOTSUPP);
+		break;
 
 	case DVACT_DEACTIVATE:
 		sc->sc_dying = 1;
diff --git a/sys/dev/usb/udcf.c b/sys/dev/usb/udcf.c
index 9b69af22aa1..7a0f78045a5 100644
--- a/sys/dev/usb/udcf.c
+++ b/sys/dev/usb/udcf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: udcf.c,v 1.15 2006/06/19 16:23:32 mbalmer Exp $ */
+/*	$OpenBSD: udcf.c,v 1.16 2006/06/23 06:27:11 miod Exp $ */
 
 /*
  * Copyright (c) 2006 Marc Balmer <mbalmer@openbsd.org>
@@ -628,7 +628,7 @@ udcf_activate(device_ptr_t self, enum devact act)
 
 	switch (act) {
 	case DVACT_ACTIVATE:
-		return (EOPNOTSUPP);
+		break;
 
 	case DVACT_DEACTIVATE:
 		sc->sc_dying = 1;
diff --git a/sys/dev/usb/udsbr.c b/sys/dev/usb/udsbr.c
index ae8685db6f5..74e26f55e37 100644
--- a/sys/dev/usb/udsbr.c
+++ b/sys/dev/usb/udsbr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: udsbr.c,v 1.8 2005/08/01 05:36:48 brad Exp $	*/
+/*	$OpenBSD: udsbr.c,v 1.9 2006/06/23 06:27:11 miod Exp $	*/
 /*	$NetBSD: udsbr.c,v 1.7 2002/07/11 21:14:27 augustss Exp $	*/
 
 /*
@@ -173,7 +173,6 @@ udsbr_activate(device_ptr_t self, enum devact act)
 
 	switch (act) {
 	case DVACT_ACTIVATE:
-		return (EOPNOTSUPP);
 		break;
 
 	case DVACT_DEACTIVATE:
diff --git a/sys/dev/usb/ueagle.c b/sys/dev/usb/ueagle.c
index 09fc623053d..c1762f60d17 100644
--- a/sys/dev/usb/ueagle.c
+++ b/sys/dev/usb/ueagle.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ueagle.c,v 1.10 2006/03/25 22:41:47 djm Exp $	*/
+/*	$OpenBSD: ueagle.c,v 1.11 2006/06/23 06:27:11 miod Exp $	*/
 
 /*-
  * Copyright (c) 2003-2005
@@ -1457,7 +1457,7 @@ ueagle_activate(device_ptr_t self, enum devact act)
 
 	switch (act) {
 	case DVACT_ACTIVATE:
-		return EOPNOTSUPP;
+		break;
 
 	case DVACT_DEACTIVATE:
 		if_deactivate(&sc->sc_if);
diff --git a/sys/dev/usb/uftdi.c b/sys/dev/usb/uftdi.c
index 62317bb3426..2bae95261dc 100644
--- a/sys/dev/usb/uftdi.c
+++ b/sys/dev/usb/uftdi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uftdi.c,v 1.29 2006/06/16 06:28:25 deraadt Exp $ 	*/
+/*	$OpenBSD: uftdi.c,v 1.30 2006/06/23 06:27:11 miod Exp $ 	*/
 /*	$NetBSD: uftdi.c,v 1.14 2003/02/23 04:20:07 simonb Exp $	*/
 
 /*
@@ -380,7 +380,7 @@ uftdi_activate(device_ptr_t self, enum devact act)
 
 	switch (act) {
 	case DVACT_ACTIVATE:
-		return (EOPNOTSUPP);
+		break;
 
 	case DVACT_DEACTIVATE:
 		if (sc->sc_subdev != NULL)
diff --git a/sys/dev/usb/ugen.c b/sys/dev/usb/ugen.c
index d0a0df2db9a..1c503715fd6 100644
--- a/sys/dev/usb/ugen.c
+++ b/sys/dev/usb/ugen.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ugen.c,v 1.34 2006/06/17 16:27:58 miod Exp $ */
+/*	$OpenBSD: ugen.c,v 1.35 2006/06/23 06:27:11 miod Exp $ */
 /*	$NetBSD: ugen.c,v 1.63 2002/11/26 18:49:48 christos Exp $	*/
 /*	$FreeBSD: src/sys/dev/usb/ugen.c,v 1.26 1999/11/17 22:33:41 n_hibma Exp $	*/
 
@@ -789,7 +789,7 @@ ugen_activate(device_ptr_t self, enum devact act)
 
 	switch (act) {
 	case DVACT_ACTIVATE:
-		return (EOPNOTSUPP);
+		break;
 
 	case DVACT_DEACTIVATE:
 		sc->sc_dying = 1;
diff --git a/sys/dev/usb/uhci.c b/sys/dev/usb/uhci.c
index 8ded2cc3deb..00e34cfc7c8 100644
--- a/sys/dev/usb/uhci.c
+++ b/sys/dev/usb/uhci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uhci.c,v 1.47 2006/05/31 06:18:09 pascoe Exp $	*/
+/*	$OpenBSD: uhci.c,v 1.48 2006/06/23 06:27:11 miod Exp $	*/
 /*	$NetBSD: uhci.c,v 1.172 2003/02/23 04:19:26 simonb Exp $	*/
 /*	$FreeBSD: src/sys/dev/usb/uhci.c,v 1.33 1999/11/17 22:33:41 n_hibma Exp $	*/
 
@@ -540,7 +540,7 @@ uhci_activate(device_ptr_t self, enum devact act)
 
 	switch (act) {
 	case DVACT_ACTIVATE:
-		return (EOPNOTSUPP);
+		break;
 
 	case DVACT_DEACTIVATE:
 		if (sc->sc_child != NULL)
diff --git a/sys/dev/usb/uhid.c b/sys/dev/usb/uhid.c
index 4c6800311b3..dfda586c832 100644
--- a/sys/dev/usb/uhid.c
+++ b/sys/dev/usb/uhid.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uhid.c,v 1.28 2005/11/21 18:16:43 millert Exp $ */
+/*	$OpenBSD: uhid.c,v 1.29 2006/06/23 06:27:11 miod Exp $ */
 /*	$NetBSD: uhid.c,v 1.57 2003/03/11 16:44:00 augustss Exp $	*/
 
 /*
@@ -167,7 +167,7 @@ uhid_activate(device_ptr_t self, enum devact act)
 
 	switch (act) {
 	case DVACT_ACTIVATE:
-		return (EOPNOTSUPP);
+		break;
 
 	case DVACT_DEACTIVATE:
 		sc->sc_dying = 1;
diff --git a/sys/dev/usb/uhidev.c b/sys/dev/usb/uhidev.c
index d6ff3465b56..81f2c59ec8f 100644
--- a/sys/dev/usb/uhidev.c
+++ b/sys/dev/usb/uhidev.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uhidev.c,v 1.15 2006/06/17 16:27:58 miod Exp $	*/
+/*	$OpenBSD: uhidev.c,v 1.16 2006/06/23 06:27:11 miod Exp $	*/
 /*	$NetBSD: uhidev.c,v 1.14 2003/03/11 16:44:00 augustss Exp $	*/
 
 /*
@@ -336,14 +336,13 @@ int
 uhidev_activate(device_ptr_t self, enum devact act)
 {
 	struct uhidev_softc *sc = (struct uhidev_softc *)self;
-	int i, rv;
+	int i, rv = 0;
 
 	switch (act) {
 	case DVACT_ACTIVATE:
-		return (EOPNOTSUPP);
+		break;
 
 	case DVACT_DEACTIVATE:
-		rv = 0;
 		for (i = 0; i < sc->sc_nrepid; i++)
 			if (sc->sc_subdevs[i] != NULL)
 				rv |= config_deactivate(
diff --git a/sys/dev/usb/uhub.c b/sys/dev/usb/uhub.c
index 6371b22b6d6..387df78c059 100644
--- a/sys/dev/usb/uhub.c
+++ b/sys/dev/usb/uhub.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uhub.c,v 1.32 2005/08/01 05:36:48 brad Exp $ */
+/*	$OpenBSD: uhub.c,v 1.33 2006/06/23 06:27:11 miod Exp $ */
 /*	$NetBSD: uhub.c,v 1.64 2003/02/08 03:32:51 ichiro Exp $	*/
 /*	$FreeBSD: src/sys/dev/usb/uhub.c,v 1.18 1999/11/17 22:33:43 n_hibma Exp $	*/
 
@@ -537,7 +537,7 @@ uhub_activate(device_ptr_t self, enum devact act)
 
 	switch (act) {
 	case DVACT_ACTIVATE:
-		return (EOPNOTSUPP);
+		break;
 
 	case DVACT_DEACTIVATE:
 		if (hub == NULL) /* malfunctioning hub */
diff --git a/sys/dev/usb/uipaq.c b/sys/dev/usb/uipaq.c
index 70ed3cd8c98..478bf2b91a7 100644
--- a/sys/dev/usb/uipaq.c
+++ b/sys/dev/usb/uipaq.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uipaq.c,v 1.3 2006/04/16 04:01:12 brad Exp $	*/
+/*	$OpenBSD: uipaq.c,v 1.4 2006/06/23 06:27:11 miod Exp $	*/
 
 /*
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -359,7 +359,6 @@ uipaq_activate(device_ptr_t self, enum devact act)
 
 	switch (act) {
 	case DVACT_ACTIVATE:
-		return (EOPNOTSUPP);
 		break;
 
 	case DVACT_DEACTIVATE:
diff --git a/sys/dev/usb/ukbd.c b/sys/dev/usb/ukbd.c
index 6fd92e02d71..d710e49038f 100644
--- a/sys/dev/usb/ukbd.c
+++ b/sys/dev/usb/ukbd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ukbd.c,v 1.23 2005/11/21 18:16:44 millert Exp $	*/
+/*	$OpenBSD: ukbd.c,v 1.24 2006/06/23 06:27:11 miod Exp $	*/
 /*      $NetBSD: ukbd.c,v 1.85 2003/03/11 16:44:00 augustss Exp $        */
 
 /*
@@ -384,7 +384,7 @@ ukbd_activate(device_ptr_t self, enum devact act)
 
 	switch (act) {
 	case DVACT_ACTIVATE:
-		return (EOPNOTSUPP);
+		break;
 
 	case DVACT_DEACTIVATE:
 		if (sc->sc_wskbddev != NULL)
diff --git a/sys/dev/usb/ulpt.c b/sys/dev/usb/ulpt.c
index 7459cf346b8..1cde8217c7e 100644
--- a/sys/dev/usb/ulpt.c
+++ b/sys/dev/usb/ulpt.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ulpt.c,v 1.20 2005/08/01 05:36:49 brad Exp $ */
+/*	$OpenBSD: ulpt.c,v 1.21 2006/06/23 06:27:11 miod Exp $ */
 /*	$NetBSD: ulpt.c,v 1.57 2003/01/05 10:19:42 scw Exp $	*/
 /*	$FreeBSD: src/sys/dev/usb/ulpt.c,v 1.24 1999/11/17 22:33:44 n_hibma Exp $	*/
 
@@ -363,7 +363,7 @@ ulpt_activate(device_ptr_t self, enum devact act)
 
 	switch (act) {
 	case DVACT_ACTIVATE:
-		return (EOPNOTSUPP);
+		break;
 
 	case DVACT_DEACTIVATE:
 		sc->sc_dying = 1;
diff --git a/sys/dev/usb/umass.c b/sys/dev/usb/umass.c
index 5c22a5bac58..4e54c5e84c8 100644
--- a/sys/dev/usb/umass.c
+++ b/sys/dev/usb/umass.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: umass.c,v 1.43 2005/08/01 05:36:49 brad Exp $ */
+/*	$OpenBSD: umass.c,v 1.44 2006/06/23 06:27:11 miod Exp $ */
 /*	$NetBSD: umass.c,v 1.116 2004/06/30 05:53:46 mycroft Exp $	*/
 
 /*
@@ -700,7 +700,6 @@ umass_activate(struct device *dev, enum devact act)
 
 	switch (act) {
 	case DVACT_ACTIVATE:
-		rv = EOPNOTSUPP;
 		break;
 
 	case DVACT_DEACTIVATE:
diff --git a/sys/dev/usb/umct.c b/sys/dev/usb/umct.c
index 3ade0b8518c..9ce1d904b9e 100644
--- a/sys/dev/usb/umct.c
+++ b/sys/dev/usb/umct.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: umct.c,v 1.16 2005/11/21 18:16:44 millert Exp $	*/
+/*	$OpenBSD: umct.c,v 1.17 2006/06/23 06:27:12 miod Exp $	*/
 /*	$NetBSD: umct.c,v 1.10 2003/02/23 04:20:07 simonb Exp $	*/
 /*
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -343,7 +343,7 @@ umct_activate(device_ptr_t self, enum devact act)
 
 	switch (act) {
 	case DVACT_ACTIVATE:
-		return (EOPNOTSUPP);
+		break;
 
 	case DVACT_DEACTIVATE:
 		if (sc->sc_subdev != NULL)
diff --git a/sys/dev/usb/umidi.c b/sys/dev/usb/umidi.c
index 8731d5c445f..c0dc4ec8553 100644
--- a/sys/dev/usb/umidi.c
+++ b/sys/dev/usb/umidi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: umidi.c,v 1.15 2006/04/07 22:41:33 jsg Exp $	*/
+/*	$OpenBSD: umidi.c,v 1.16 2006/06/23 06:27:12 miod Exp $	*/
 /*	$NetBSD: umidi.c,v 1.16 2002/07/11 21:14:32 augustss Exp $	*/
 /*
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -235,8 +235,6 @@ umidi_activate(device_ptr_t self, enum devact act)
 	switch (act) {
 	case DVACT_ACTIVATE:
 		DPRINTFN(1,("umidi_activate (activate)\n"));
-
-		return EOPNOTSUPP;
 		break;
 	case DVACT_DEACTIVATE:
 		DPRINTFN(1,("umidi_activate (deactivate)\n"));
diff --git a/sys/dev/usb/umodem.c b/sys/dev/usb/umodem.c
index c3f965cee40..38421362b55 100644
--- a/sys/dev/usb/umodem.c
+++ b/sys/dev/usb/umodem.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: umodem.c,v 1.20 2005/11/21 18:16:44 millert Exp $ */
+/*	$OpenBSD: umodem.c,v 1.21 2006/06/23 06:27:12 miod Exp $ */
 /*	$NetBSD: umodem.c,v 1.45 2002/09/23 05:51:23 simonb Exp $	*/
 
 /*
@@ -718,7 +718,7 @@ umodem_activate(device_ptr_t self, enum devact act)
 
 	switch (act) {
 	case DVACT_ACTIVATE:
-		return (EOPNOTSUPP);
+		break;
 
 	case DVACT_DEACTIVATE:
 		sc->sc_dying = 1;
diff --git a/sys/dev/usb/ums.c b/sys/dev/usb/ums.c
index 25fc6991edf..decb27e40a8 100644
--- a/sys/dev/usb/ums.c
+++ b/sys/dev/usb/ums.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ums.c,v 1.16 2005/11/21 18:16:44 millert Exp $ */
+/*	$OpenBSD: ums.c,v 1.17 2006/06/23 06:27:12 miod Exp $ */
 /*	$NetBSD: ums.c,v 1.60 2003/03/11 16:44:00 augustss Exp $	*/
 
 /*
@@ -252,7 +252,7 @@ ums_activate(device_ptr_t self, enum devact act)
 
 	switch (act) {
 	case DVACT_ACTIVATE:
-		return (EOPNOTSUPP);
+		break;
 
 	case DVACT_DEACTIVATE:
 		if (sc->sc_wsmousedev != NULL)
diff --git a/sys/dev/usb/umsm.c b/sys/dev/usb/umsm.c
index c0d65e6e340..84a43f05039 100644
--- a/sys/dev/usb/umsm.c
+++ b/sys/dev/usb/umsm.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: umsm.c,v 1.1 2006/03/24 10:31:22 jsg Exp $	*/
+/*	$OpenBSD: umsm.c,v 1.2 2006/06/23 06:27:12 miod Exp $	*/
 
 /*
  * Copyright (c) 2006 Jonathan Gray <jsg@openbsd.org>
@@ -178,7 +178,7 @@ umsm_activate(device_ptr_t self, enum devact act)
 
 	switch (act) {
 	case DVACT_ACTIVATE:
-		return (EOPNOTSUPP);
+		break;
 
 	case DVACT_DEACTIVATE:
 		if (sc->sc_subdev != NULL)
diff --git a/sys/dev/usb/uplcom.c b/sys/dev/usb/uplcom.c
index b615396fb50..7816743f4b7 100644
--- a/sys/dev/usb/uplcom.c
+++ b/sys/dev/usb/uplcom.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uplcom.c,v 1.29 2006/04/15 04:37:52 jsg Exp $	*/
+/*	$OpenBSD: uplcom.c,v 1.30 2006/06/23 06:27:12 miod Exp $	*/
 /*	$NetBSD: uplcom.c,v 1.29 2002/09/23 05:51:23 simonb Exp $	*/
 /*
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -451,7 +451,7 @@ uplcom_activate(device_ptr_t self, enum devact act)
 
 	switch (act) {
 	case DVACT_ACTIVATE:
-		return (EOPNOTSUPP);
+		break;
 
 	case DVACT_DEACTIVATE:
 		if (sc->sc_subdev != NULL)
diff --git a/sys/dev/usb/urio.c b/sys/dev/usb/urio.c
index 513eaf0557f..38c92880962 100644
--- a/sys/dev/usb/urio.c
+++ b/sys/dev/usb/urio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: urio.c,v 1.20 2005/11/21 18:16:44 millert Exp $	*/
+/*	$OpenBSD: urio.c,v 1.21 2006/06/23 06:27:12 miod Exp $	*/
 /*	$NetBSD: urio.c,v 1.15 2002/10/23 09:14:02 jdolecek Exp $	*/
 
 /*
@@ -296,7 +296,6 @@ urio_activate(device_ptr_t self, enum devact act)
 
 	switch (act) {
 	case DVACT_ACTIVATE:
-		return (EOPNOTSUPP);
 		break;
 
 	case DVACT_DEACTIVATE:
diff --git a/sys/dev/usb/usb.c b/sys/dev/usb/usb.c
index 7a4f88561a2..e324f85c8ea 100644
--- a/sys/dev/usb/usb.c
+++ b/sys/dev/usb/usb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: usb.c,v 1.32 2005/11/21 18:16:44 millert Exp $	*/
+/*	$OpenBSD: usb.c,v 1.33 2006/06/23 06:27:12 miod Exp $	*/
 /*	$NetBSD: usb.c,v 1.77 2003/01/01 00:10:26 thorpej Exp $	*/
 
 /*
@@ -798,7 +798,7 @@ usb_activate(device_ptr_t self, enum devact act)
 
 	switch (act) {
 	case DVACT_ACTIVATE:
-		return (EOPNOTSUPP);
+		break;
 
 	case DVACT_DEACTIVATE:
 		sc->sc_dying = 1;
diff --git a/sys/dev/usb/uscanner.c b/sys/dev/usb/uscanner.c
index c49018b5947..a0405fbe10f 100644
--- a/sys/dev/usb/uscanner.c
+++ b/sys/dev/usb/uscanner.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uscanner.c,v 1.19 2005/11/21 18:16:44 millert Exp $ */
+/*	$OpenBSD: uscanner.c,v 1.20 2006/06/23 06:27:12 miod Exp $ */
 /*	$NetBSD: uscanner.c,v 1.40 2003/01/27 00:32:44 wiz Exp $	*/
 
 /*
@@ -610,7 +610,7 @@ uscanner_activate(device_ptr_t self, enum devact act)
 
 	switch (act) {
 	case DVACT_ACTIVATE:
-		return (EOPNOTSUPP);
+		break;
 
 	case DVACT_DEACTIVATE:
 		sc->sc_dying = 1;
diff --git a/sys/dev/usb/uslcom.c b/sys/dev/usb/uslcom.c
index b8622f69fb1..2ad1de01575 100644
--- a/sys/dev/usb/uslcom.c
+++ b/sys/dev/usb/uslcom.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uslcom.c,v 1.2 2006/04/29 02:58:15 jsg Exp $	*/
+/*	$OpenBSD: uslcom.c,v 1.3 2006/06/23 06:27:12 miod Exp $	*/
 
 /*
  * Copyright (c) 2006 Jonathan Gray <jsg@openbsd.org>
@@ -239,7 +239,7 @@ uslcom_activate(device_ptr_t self, enum devact act)
 
 	switch (act) {
 	case DVACT_ACTIVATE:
-		return (EOPNOTSUPP);
+		break;
 
 	case DVACT_DEACTIVATE:
 		if (sc->sc_subdev != NULL)
diff --git a/sys/dev/usb/usscanner.c b/sys/dev/usb/usscanner.c
index 056ace1f462..d669ee1d245 100644
--- a/sys/dev/usb/usscanner.c
+++ b/sys/dev/usb/usscanner.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: usscanner.c,v 1.10 2005/08/01 05:36:49 brad Exp $	*/
+/*	$OpenBSD: usscanner.c,v 1.11 2006/06/23 06:27:12 miod Exp $	*/
 /*	$NetBSD: usscanner.c,v 1.6 2001/01/23 14:04:14 augustss Exp $	*/
 
 /*
@@ -440,7 +440,6 @@ usscanner_activate(device_ptr_t self, enum devact act)
 
 	switch (act) {
 	case DVACT_ACTIVATE:
-		return (EOPNOTSUPP);
 		break;
 
 	case DVACT_DEACTIVATE:
diff --git a/sys/dev/usb/uvisor.c b/sys/dev/usb/uvisor.c
index f2ca52645c7..ab6a106f120 100644
--- a/sys/dev/usb/uvisor.c
+++ b/sys/dev/usb/uvisor.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uvisor.c,v 1.26 2006/06/21 01:23:05 jsg Exp $	*/
+/*	$OpenBSD: uvisor.c,v 1.27 2006/06/23 06:27:12 miod Exp $	*/
 /*	$NetBSD: uvisor.c,v 1.21 2003/08/03 21:59:26 nathanw Exp $	*/
 
 /*
@@ -383,7 +383,6 @@ uvisor_activate(device_ptr_t self, enum devact act)
 
 	switch (act) {
 	case DVACT_ACTIVATE:
-		return (EOPNOTSUPP);
 		break;
 
 	case DVACT_DEACTIVATE:
diff --git a/sys/dev/usb/uvscom.c b/sys/dev/usb/uvscom.c
index 40a769d1984..bf64d61eeef 100644
--- a/sys/dev/usb/uvscom.c
+++ b/sys/dev/usb/uvscom.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uvscom.c,v 1.7 2005/08/01 05:41:54 brad Exp $ */
+/*	$OpenBSD: uvscom.c,v 1.8 2006/06/23 06:27:12 miod Exp $ */
 /*	$NetBSD: uvscom.c,v 1.9 2003/02/12 15:36:20 ichiro Exp $	*/
 /*-
  * Copyright (c) 2001-2002, Shunsuke Akiyama <akiyama@jp.FreeBSD.org>.
@@ -441,7 +441,7 @@ uvscom_activate(device_ptr_t self, enum devact act)
 
 	switch (act) {
 	case DVACT_ACTIVATE:
-		return (EOPNOTSUPP);
+		break;
 
 	case DVACT_DEACTIVATE:
 		if (sc->sc_subdev != NULL)