diff options
| -rw-r--r-- | sys/dev/usb/uftdi.c | 3 | ||||
| -rw-r--r-- | sys/dev/usb/ugen.c | 5 | ||||
| -rw-r--r-- | sys/dev/usb/uhid.c | 5 | ||||
| -rw-r--r-- | sys/dev/usb/uhub.c | 3 | ||||
| -rw-r--r-- | sys/dev/usb/usb.c | 5 | ||||
| -rw-r--r-- | sys/dev/usb/uscanner.c | 5 |
6 files changed, 18 insertions, 8 deletions
diff --git a/sys/dev/usb/uftdi.c b/sys/dev/usb/uftdi.c index 93e4d0f..7db68ef 100644 --- a/sys/dev/usb/uftdi.c +++ b/sys/dev/usb/uftdi.c @@ -1,4 +1,4 @@ -/* $NetBSD: uftdi.c,v 1.12 2002/07/18 14:44:10 scw Exp $ */ +/* $NetBSD: uftdi.c,v 1.13 2002/09/23 05:51:23 simonb Exp $ */ /* $FreeBSD$ */ /* @@ -282,7 +282,6 @@ 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 111f423..e7f4bda 100644 --- a/sys/dev/usb/ugen.c +++ b/sys/dev/usb/ugen.c @@ -1,6 +1,10 @@ /* $NetBSD: ugen.c,v 1.57 2002/02/11 15:11:49 augustss Exp $ */ /* $FreeBSD$ */ +/* Also already merged from NetBSD: + * $NetBSD: ugen.c,v 1.61 2002/09/23 05:51:20 simonb Exp $ + */ + /* * Copyright (c) 1998 The NetBSD Foundation, Inc. * All rights reserved. @@ -833,7 +837,6 @@ 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/uhid.c b/sys/dev/usb/uhid.c index 493b4ae..9fa2937 100644 --- a/sys/dev/usb/uhid.c +++ b/sys/dev/usb/uhid.c @@ -1,6 +1,10 @@ /* $NetBSD: uhid.c,v 1.45 2001/10/26 17:58:21 augustss Exp $ */ /* $FreeBSD$ */ +/* Also already merged from NetBSD: + * $NetBSD: uhid.c,v 1.54 2002/09/23 05:51:21 simonb Exp $ + */ + /* * Copyright (c) 1998 The NetBSD Foundation, Inc. * All rights reserved. @@ -283,7 +287,6 @@ 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/uhub.c b/sys/dev/usb/uhub.c index 407bcd5..5767904 100644 --- a/sys/dev/usb/uhub.c +++ b/sys/dev/usb/uhub.c @@ -1,4 +1,4 @@ -/* $NetBSD: uhub.c,v 1.57 2001/11/20 16:08:37 augustss Exp $ */ +/* $NetBSD: uhub.c,v 1.59 2002/09/23 05:51:20 simonb Exp $ */ /* $FreeBSD$ */ /* Also already merged from netbsd: @@ -521,7 +521,6 @@ 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/usb.c b/sys/dev/usb/usb.c index 72c571d..e074650 100644 --- a/sys/dev/usb/usb.c +++ b/sys/dev/usb/usb.c @@ -1,6 +1,10 @@ /* $NetBSD: usb.c,v 1.67 2002/02/11 15:11:49 augustss Exp $ */ /* $FreeBSD$ */ +/* Also already merged from NetBSD: + * $NetBSD: usb.c,v 1.73 2002/09/23 05:51:19 simonb Exp $ + */ + /* * Copyright (c) 1998 The NetBSD Foundation, Inc. * All rights reserved. @@ -838,7 +842,6 @@ 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 7817006..e3d275b 100644 --- a/sys/dev/usb/uscanner.c +++ b/sys/dev/usb/uscanner.c @@ -1,6 +1,10 @@ /* $NetBSD: uscanner.c,v 1.30 2002/07/11 21:14:36 augustss Exp$ */ /* $FreeBSD$ */ +/* Also already merged from NetBSD: + * $NetBSD: uscanner.c,v 1.33 2002/09/23 05:51:24 simonb Exp $ + */ + /* * Copyright (c) 2000 The NetBSD Foundation, Inc. * All rights reserved. @@ -597,7 +601,6 @@ uscanner_activate(device_ptr_t self, enum devact act) switch (act) { case DVACT_ACTIVATE: return (EOPNOTSUPP); - break; case DVACT_DEACTIVATE: sc->sc_dying = 1; |
